diff --git a/src/server/services/wfs/qgswfsgetfeature.cpp b/src/server/services/wfs/qgswfsgetfeature.cpp
index 133be00e386f..88233d2c0acf 100644
--- a/src/server/services/wfs/qgswfsgetfeature.cpp
+++ b/src/server/services/wfs/qgswfsgetfeature.cpp
@@ -201,7 +201,7 @@ namespace QgsWfs
       getFeatureQuery &query = *qIt;
       QString typeName = query.typeName;
 
-      if ( !mapLayerMap.keys().contains( typeName ) )
+      if ( !mapLayerMap.contains( typeName ) )
       {
         throw QgsRequestNotWellFormedException( QStringLiteral( "TypeName '%1' unknown" ).arg( typeName ) );
       }
@@ -333,7 +333,7 @@ namespace QgsWfs
         accessControl->filterFeatures( vlayer, featureRequest );
 
         QStringList attributes = QStringList();
-        for ( int idx : attrIndexes )
+        for ( int idx : qgis::as_const( attrIndexes ) )
         {
           attributes.append( vlayer->fields().field( idx ).name() );
         }
diff --git a/src/server/services/wfs/qgswfsutils.cpp b/src/server/services/wfs/qgswfsutils.cpp
index bd10df1d34fc..292327473796 100644
--- a/src/server/services/wfs/qgswfsutils.cpp
+++ b/src/server/services/wfs/qgswfsutils.cpp
@@ -56,7 +56,8 @@ namespace QgsWfs
       href = request.originalUrl();
       QUrlQuery q( href );
 
-      for ( auto param : q.queryItems() )
+      const auto constQueryItems = q.queryItems();
+      for ( const auto &param : constQueryItems )
       {
         if ( sFilter.contains( param.first.toUpper() ) )
           q.removeAllQueryItems( param.first );
@@ -73,14 +74,14 @@ namespace QgsWfs
     QString name = layer->name();
     if ( !layer->shortName().isEmpty() )
       name = layer->shortName();
-    name = name.replace( ' ', '_' );
+    name = name.replace( ' ', '_' ).replace( ':', '-' );
     return name;
   }
 
   QgsVectorLayer *layerByTypeName( const QgsProject *project, const QString &typeName )
   {
     QStringList layerIds = QgsServerProjectUtils::wfsLayerIds( *project );
-    for ( const QString &layerId : layerIds )
+    for ( const QString &layerId : qgis::as_const( layerIds ) )
     {
       QgsMapLayer *layer = project->mapLayer( layerId );
       if ( !layer )