diff --git a/python/core/qgssymbol.sip b/python/core/qgssymbol.sip
index e658373c57a..f9e035c35f6 100644
--- a/python/core/qgssymbol.sip
+++ b/python/core/qgssymbol.sip
@@ -72,7 +72,7 @@ class QgsSymbol
     /** Get QImage representation of point symbol with current settings
      * and scaled (can be slow when scale != 1.0)
      */
-    virtual QImage getPointSymbolAsImage( double widthScale = 1.,
+    virtual QImage getPointSymbolAsImage( double widthScale = 1.0,
                                           bool selected = false,
                                           QColor selectionColor = Qt::yellow,
                                           double scale = 1.0,
diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
index 77148de942e..74f70cbc9d9 100644
--- a/src/core/symbology/qgssymbol.h
+++ b/src/core/symbology/qgssymbol.h
@@ -101,13 +101,13 @@ class CORE_EXPORT QgsSymbol
 
     /** Get QImage representation of point symbol with current settings
     */
-    virtual QImage getCachedPointSymbolAsImage( double widthScale = 1.,
+    virtual QImage getCachedPointSymbolAsImage( double widthScale = 1.0,
         bool selected = false, QColor selectionColor = Qt::yellow );
 
     /** Get QImage representation of point symbol with current settings
      * and scaled (can be slow when scale != 1.0)
      */
-    virtual QImage getPointSymbolAsImage( double widthScale = 1.,
+    virtual QImage getPointSymbolAsImage( double widthScale = 1.0,
                                           bool selected = false,
                                           QColor selectionColor = Qt::yellow,
                                           double scale = 1.0,
diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
index 8347edba910..c337028dc24 100644
--- a/src/plugins/grass/CMakeLists.txt
+++ b/src/plugins/grass/CMakeLists.txt
@@ -142,6 +142,7 @@ INCLUDE_DIRECTORIES(
      ${GRASS_INCLUDE_DIR}
      ${GDAL_INCLUDE_DIR}
      ${PROJ_INCLUDE_DIR}
+     ${GEOS_INCLUDE_DIR}
      qtermwidget
 )
 
diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
index b3b3e7a3af0..a76ae02caee 100644
--- a/src/providers/grass/CMakeLists.txt
+++ b/src/providers/grass/CMakeLists.txt
@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES (
   ${GRASS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
+  ${GEOS_INCLUDE_DIR}
 )