diff --git a/SamTFE/Sources/Entities/MusicHolder.es b/SamTFE/Sources/Entities/MusicHolder.es
index 8a1c395e..f4ba8b81 100644
--- a/SamTFE/Sources/Entities/MusicHolder.es
+++ b/SamTFE/Sources/Entities/MusicHolder.es
@@ -658,30 +658,30 @@ procedures:
         }
       }
       // Fix Alley Of Sphinxes textures
-      if ( strModName=="" && strLevelName=="11_AlleyOfSphinxes") {
+      if (/* strModName=="" && */ strLevelName=="11_AlleyOfSphinxes") {
         FixTexturesOnAlleyOfSphinxes();
       }
     } else if(iBugFixMetod == 2) {
       // Fix textures
-      if ( strModName=="" && strLevelName=="04_ValleyOfTheKings") {
+      if (/* strModName=="" && */ strLevelName=="04_ValleyOfTheKings") {
         FixTexturesValleyOfTheKings();
-      } else if ( strModName=="" && strLevelName=="07_Dunes") {
+      } else if (/* strModName=="" && */ strLevelName=="07_Dunes") {
         FixTexturesDunes();
-      } else if ( strModName=="" && strLevelName=="08_Suburbs") {
+      } else if (/* strModName=="" && */ strLevelName=="08_Suburbs") {
         FixTexturesSuburbs();
-      } else if ( strModName=="" && strLevelName=="10_Metropolis") {
+      } else if (/* strModName=="" && */ strLevelName=="10_Metropolis") {
         FixTexturesMetropolis();
-      } else if ( strModName=="" && strLevelName=="11_AlleyOfSphinxes") {
+      } else if (/* strModName=="" && */ strLevelName=="11_AlleyOfSphinxes") {
         FixTexturesAlleyOfSphinxes();
-      } else if ( strModName=="" && strLevelName=="12_Karnak") {
+      } else if (/* strModName=="" && */ strLevelName=="12_Karnak") {
         FixTexturesKarnak();
-      } else if ( /* strModName=="" && */ strLevelName=="13_Luxor") {
+      } else if (/* strModName=="" && */ strLevelName=="13_Luxor") {
         FixTexturesLuxor();
-      } else if ( strModName=="" && strLevelName=="14_SacredYards") {
+      } else if (/* strModName=="" && */ strLevelName=="14_SacredYards") {
         FixTexturesSacredYards();
-      } else if ( strModName=="" && strLevelName=="KarnakDemo") {
+      } else if (/* strModName=="" && */ strLevelName=="KarnakDemo") {
         FixTexturesKarnakDemo();
-      } else if ( strModName=="" && strLevelName=="Intro") {
+      } else if (/* strModName=="" && */ strLevelName=="Intro") {
         FixTexturesIntro();
       }
     }
diff --git a/SamTFE/Sources/GameMP/Game.cpp b/SamTFE/Sources/GameMP/Game.cpp
index 19cc9e1d..70ab89a6 100644
--- a/SamTFE/Sources/GameMP/Game.cpp
+++ b/SamTFE/Sources/GameMP/Game.cpp
@@ -438,30 +438,30 @@ void MaybeDiscardLastLines(void)
       }
     }
     // Fix Alley Of Sphinxes textures
-    if ( strModName=="" && strLevelName=="11_AlleyOfSphinxes") {
+    if (/* strModName=="" && */ strLevelName=="11_AlleyOfSphinxes") {
       _FixTexturesOnAlleyOfSphinxes();
     }
   } else if (iBugFixMetod == 2) {
     // Fix textures
-    if ( strModName=="" && strLevelName=="04_ValleyOfTheKings") {
+    if (/* strModName==""&& */ strLevelName=="04_ValleyOfTheKings") {
       _FixTexturesValleyOfTheKings();
-    } else if ( strModName=="" && strLevelName=="07_Dunes") {
+    } else if (/* strModName=="" && */ strLevelName=="07_Dunes") {
       _FixTexturesDunes();
-    } else if ( strModName=="" && strLevelName=="08_Suburbs") {
+    } else if (/* strModName=="" && */ strLevelName=="08_Suburbs") {
       _FixTexturesSuburbs();
-    } else if ( strModName=="" && strLevelName=="10_Metropolis") {
+    } else if (/* strModName=="" && */ strLevelName=="10_Metropolis") {
       _FixTexturesMetropolis();
-    } else if ( strModName=="" && strLevelName=="11_AlleyOfSphinxes") {
+    } else if (/* strModName=="" && */ strLevelName=="11_AlleyOfSphinxes") {
       _FixTexturesAlleyOfSphinxes();
-    } else if ( strModName=="" && strLevelName=="12_Karnak") {
+    } else if (/* strModName=="" && */ strLevelName=="12_Karnak") {
       _FixTexturesKarnak();
     } else if (/* strModName=="" && */ strLevelName=="13_Luxor") {
       _FixTexturesLuxor();
-    } else if ( strModName=="" && strLevelName=="14_SacredYards") {
+    } else if (/* strModName=="" && */ strLevelName=="14_SacredYards") {
       _FixTexturesSacredYards();
-    } else if ( strModName=="" && strLevelName=="KarnakDemo") {
+    } else if (/* strModName=="" && */ strLevelName=="KarnakDemo") {
       _FixTexturesKarnakDemo();
-    } else if ( strModName=="" && strLevelName=="Intro") {
+    } else if (/* strModName=="" && */ strLevelName=="Intro") {
       _FixTexturesIntro();
     }
   }
diff --git a/SamTFE/Sources/GameMP/Map.cpp b/SamTFE/Sources/GameMP/Map.cpp
index af9e002f..40202d60 100644
--- a/SamTFE/Sources/GameMP/Map.cpp
+++ b/SamTFE/Sources/GameMP/Map.cpp
@@ -375,7 +375,7 @@ void RenderMap( CDrawPort *pdp, ULONG ulLevelMask, CProgressHookInfo *pphi)
   pdp->PutTexture( &_toMapBcgRD, PIXaabbox2D( PIX2D(pixC2S,pixR2S), PIX2D(pixC2E,pixR2E)), C_WHITE|255);
 
   // render icons
-  for( INDEX iIcon=0; iIcon<ARRAYCOUNT(aIconCoords); iIcon++)
+  for( ULONG iIcon=0; iIcon<ARRAYCOUNT(aIconCoords); iIcon++)
   {
     // if level's icon should be rendered
     if( ulLevelMask & (1UL<<iIcon))
@@ -390,7 +390,7 @@ void RenderMap( CDrawPort *pdp, ULONG ulLevelMask, CProgressHookInfo *pphi)
   }
 
   // render paths
-  for( INDEX iPath=0; iPath<ARRAYCOUNT(aPathPrevNextLevels); iPath++)
+  for( ULONG iPath=0; iPath<ARRAYCOUNT(aPathPrevNextLevels); iPath++)
   {
     INDEX iPrevLevelBit = aPathPrevNextLevels[iPath][0];
     INDEX iNextLevelBit = aPathPrevNextLevels[iPath][1];