diff --git a/python/core/qgsdataitem.sip b/python/core/qgsdataitem.sip
index c116ba1aab6..89f7caf12ee 100644
--- a/python/core/qgsdataitem.sip
+++ b/python/core/qgsdataitem.sip
@@ -509,8 +509,7 @@ Check if the given path is hidden from the browser model
 
   public slots:
     virtual void childrenCreated();
-    virtual void directoryChanged();
-
+    void directoryChanged();
 
   protected:
     void init();
diff --git a/python/core/qgsgeometryvalidator.sip b/python/core/qgsgeometryvalidator.sip
index 6425764ec59..0f97afdac36 100644
--- a/python/core/qgsgeometryvalidator.sip
+++ b/python/core/qgsgeometryvalidator.sip
@@ -24,8 +24,7 @@ class QgsGeometryValidator : QThread
 
     virtual void run();
 
-    virtual void stop();
-
+    void stop();
 
     static void validateGeometry( const QgsGeometry *g, QList<QgsGeometry::Error> &errors /Out/, QgsGeometry::ValidationMethod method = QgsGeometry::ValidatorQgisInternal );
 %Docstring
diff --git a/python/core/symbology-ng/qgssinglesymbolrenderer.sip b/python/core/symbology-ng/qgssinglesymbolrenderer.sip
index 2e0925a235b..9363edc98fe 100644
--- a/python/core/symbology-ng/qgssinglesymbolrenderer.sip
+++ b/python/core/symbology-ng/qgssinglesymbolrenderer.sip
@@ -35,6 +35,12 @@ class QgsSingleSymbolRenderer : QgsFeatureRenderer
 
     virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
     static QgsFeatureRenderer *createFromSld( QDomElement &element, QgsWkbTypes::GeometryType geomType );
+<<<<<<< Updated upstream
+=======
+%Docstring
+ :rtype: QgsFeatureRenderer
+%End
+>>>>>>> Stashed changes
 
     virtual QgsFeatureRenderer::Capabilities capabilities();
     virtual QgsSymbolList symbols( QgsRenderContext &context );
diff --git a/python/gui/qgscollapsiblegroupbox.sip b/python/gui/qgscollapsiblegroupbox.sip
index e70c8d960fb..9e395f480e3 100644
--- a/python/gui/qgscollapsiblegroupbox.sip
+++ b/python/gui/qgscollapsiblegroupbox.sip
@@ -212,8 +212,10 @@ Returns the name of the setting group in which the collapsed state will be saved
     void init();
     virtual void showEvent( QShowEvent *event );
 
-    virtual QString saveKey() const;
-
+    QString saveKey() const;
+%Docstring
+ :rtype: str
+%End
 
 
 };
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
index 508a7d72501..432c36b738f 100755
--- a/scripts/sipify.pl
+++ b/scripts/sipify.pl
@@ -714,6 +714,7 @@ while ($LINE_IDX < $LINE_COUNT){
             elsif ( $LINE !~ m/^(\s*)virtual\b(.*)$/ ){
                 #sip often requires the virtual keyword to be present, or it chokes on covariant return types
                 #in overridden methods
+                dbg_info('adding virtual keyword for overriden method');
                 $LINE =~ s/^(\s*?)\b(.*)$/$1virtual $2\n/;
             }
         }
@@ -833,6 +834,9 @@ while ($LINE_IDX < $LINE_COUNT){
         $RETURN_TYPE = '';
         $IS_OVERRIDE = 0;
     }
+    else {
+        $IS_OVERRIDE = 0;
+    }
 }
 write_header_footer();