diff --git a/python/analysis/raster/qgsalignraster.sip b/python/analysis/raster/qgsalignraster.sip
index 08b78782da0..eaa574f9919 100644
--- a/python/analysis/raster/qgsalignraster.sip
+++ b/python/analysis/raster/qgsalignraster.sip
@@ -130,7 +130,7 @@ class QgsAlignRaster
     //! to determine suitable defaults for cell size and grid offset.
     //!
     //! @return true on success (may fail if it is not possible to reproject raster to given CRS)
-    bool setParametersFromRaster( const RasterInfo& rasterInfo, const QString& customCRSWkt = QString(), QSizeF customCellSize = QSizeF(), QPointF customGridOffset = QPointF( -1, -1 ) );
+    bool setParametersFromRaster( const QgsAlignRaster::RasterInfo& rasterInfo, const QString& customCRSWkt = QString(), QSizeF customCellSize = QSizeF(), QPointF customGridOffset = QPointF( -1, -1 ) );
     //! Overridden variant for convenience, taking filename instead RasterInfo object.
     //! See the other variant for details.
     bool setParametersFromRaster( const QString& filename, const QString& customCRSWkt = QString(), QSizeF customCellSize = QSizeF(), QPointF customGridOffset = QPointF( -1, -1 ) );
diff --git a/src/analysis/raster/qgsalignraster.h b/src/analysis/raster/qgsalignraster.h
index f4c90febadd..a2dae3ac298 100644
--- a/src/analysis/raster/qgsalignraster.h
+++ b/src/analysis/raster/qgsalignraster.h
@@ -41,7 +41,7 @@ class ANALYSIS_EXPORT QgsAlignRaster
     QgsAlignRaster();
 
     //! Utility class for gathering information about rasters
-    struct RasterInfo
+    struct ANALYSIS_EXPORT RasterInfo
     {
     public:
       //! Construct raster info with a path to a raster file
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
index 2e1885acbe0..4e18e1cbd4f 100644
--- a/src/server/qgsserver.cpp
+++ b/src/server/qgsserver.cpp
@@ -453,7 +453,7 @@ QByteArray QgsServer::handleRequest( const QString queryString ,
    */
   if ( ! queryString.isEmpty() )
   {
-    setenv( "QUERY_STRING", queryString.toUtf8( ), 1 );
+    putenv( QString( "QUERY_STRING=%1" ).arg( queryString ).toUtf8( ) );
   }
 
   int logLevel = QgsServerLogger::instance()->logLevel();