diff --git a/python/core/qgsconditionalstyle.sip b/python/core/qgsconditionalstyle.sip
index 4ae13d252c3..267007345c6 100644
--- a/python/core/qgsconditionalstyle.sip
+++ b/python/core/qgsconditionalstyle.sip
@@ -24,6 +24,7 @@ class QgsConditionalLayerStyles
 
     /**
      * @brief Set the conditional styles for the field UI properties.
+     * @param fieldName name of field
      * @param styles
      */
     void setFieldStyles( QString fieldName, QList<QgsConditionalStyle> styles );
@@ -36,11 +37,11 @@ class QgsConditionalLayerStyles
 
     /** Reads field ui properties specific state from Dom node.
      */
-    virtual bool readXml( const QDomNode& node );
+    bool readXml( const QDomNode& node );
 
     /** Write field ui properties specific state from Dom node.
      */
-    virtual bool writeXml( QDomNode & node, QDomDocument & doc ) const;
+    bool writeXml( QDomNode & node, QDomDocument & doc ) const;
 };
 
 /** \class QgsConditionalStyle
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
index 4433c807efe..e515ebeaca7 100644
--- a/python/core/qgsvectorlayer.sip
+++ b/python/core/qgsvectorlayer.sip
@@ -1245,7 +1245,7 @@ class QgsVectorLayer : QgsMapLayer
     /**
      * @brief Return the conditional styles that are set for this layer. Style information is
      * used to render conditional formatting in the attribute table.
-     * @return Return a \class QgsConditionalLayerStyles object holding the conditional attribute
+     * @return Return a QgsConditionalLayerStyles object holding the conditional attribute
      * style information. Style information is generic and can be used for anything.
      * @note added in QGIS 2.12
      */
diff --git a/src/core/qgsconditionalstyle.cpp b/src/core/qgsconditionalstyle.cpp
index 619f48832c2..350e20f0137 100644
--- a/src/core/qgsconditionalstyle.cpp
+++ b/src/core/qgsconditionalstyle.cpp
@@ -119,12 +119,12 @@ QgsConditionalStyle::QgsConditionalStyle( QString rule )
 
 QgsConditionalStyle::QgsConditionalStyle( const QgsConditionalStyle &other )
     : mValid( other.mValid )
+    , mName( other.mName )
     , mRule( other.mRule )
     , mFont( other.mFont )
     , mBackColor( other.mBackColor )
     , mTextColor( other.mTextColor )
     , mIcon( other.mIcon )
-    , mName( other.mName )
 {
   if ( other.mSymbol.data() )
     mSymbol.reset( other.mSymbol->clone() );
diff --git a/src/core/qgsconditionalstyle.h b/src/core/qgsconditionalstyle.h
index e5b62764596..317095fcd2c 100644
--- a/src/core/qgsconditionalstyle.h
+++ b/src/core/qgsconditionalstyle.h
@@ -36,6 +36,7 @@ class CORE_EXPORT QgsConditionalLayerStyles
 
     /**
      * @brief Set the conditional styles for the field UI properties.
+     * @param fieldName name of field
      * @param styles
      */
     void setFieldStyles( QString fieldName, QList<QgsConditionalStyle> styles );
@@ -48,11 +49,11 @@ class CORE_EXPORT QgsConditionalLayerStyles
 
     /** Reads field ui properties specific state from Dom node.
      */
-    virtual bool readXml( const QDomNode& node );
+    bool readXml( const QDomNode& node );
 
     /** Write field ui properties specific state from Dom node.
      */
-    virtual bool writeXml( QDomNode & node, QDomDocument & doc ) const;
+    bool writeXml( QDomNode & node, QDomDocument & doc ) const;
 
   private:
     QHash<QString, QgsConditionalStyles> mFieldStyles;
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
index a8823783bfa..61087f84bbe 100644
--- a/src/core/qgsvectorlayer.h
+++ b/src/core/qgsvectorlayer.h
@@ -1768,7 +1768,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /**
      * @brief Return the conditional styles that are set for this layer. Style information is
      * used to render conditional formatting in the attribute table.
-     * @return Return a \class QgsConditionalLayerStyles object holding the conditional attribute
+     * @return Return a QgsConditionalLayerStyles object holding the conditional attribute
      * style information. Style information is generic and can be used for anything.
      * @note added in QGIS 2.12
      */