diff --git a/src/Components/Modules/AssetHandler.cpp b/src/Components/Modules/AssetHandler.cpp
index 88164902..9dc783cc 100644
--- a/src/Components/Modules/AssetHandler.cpp
+++ b/src/Components/Modules/AssetHandler.cpp
@@ -132,6 +132,7 @@ namespace Components
 			}
 		}
 
+#if DEBUG
 		if (type == 9 && false)
 		{
 			static Game::MaterialTechniqueSet* technique = nullptr;
@@ -154,12 +155,7 @@ namespace Components
 
 							for (int k = 0; k < (pass->argCount1 + pass->argCount2 + pass->argCount3); k++)
 							{
-								fprintf(fp, "\t\t%d.%d.%d:\n", i, j, k);
-
-								fprintf(fp, "\t\t\tDest: %d\n", pass->argumentDef[k].dest & 0xFFFF);
-								fprintf(fp, "\t\t\tMore: %d\n", pass->argumentDef[k].more & 0xFFFF);
-								fprintf(fp, "\t\t\tType: %d\n", pass->argumentDef[k].type & 0xFFFF);
-								fprintf(fp, "\t\t\tPara: %d\n", pass->argumentDef[k].paramID & 0xFFFF);
+								fprintf(fp, "\t\t\t%d.%d.%d Para: %d\n", i, j, k, pass->argumentDef[k].paramID & 0xFFFF);
 							}
 						}
 					}
@@ -171,10 +167,10 @@ namespace Components
 
 			static std::map<std::string, Game::MaterialTechniqueSet*> techs;
 
-			if (FastFiles::Current() == "mp_firingrange")
+			if (FastFiles::Current() == "mp_rust_long")
 			{
 				techs[name] = asset->materialTechset;
-				printTechset(asset->materialTechset, "mp_firingrange");
+				printTechset(asset->materialTechset, "mp_rust_long");
 			}
 			else
 			{
@@ -184,8 +180,9 @@ namespace Components
 				}
 			}
 		}
+#endif
 
-		if (type == 5 && name == "wc/codo_ui_viewer_black_decal3"s)
+		if (type == Game::XAssetType::ASSET_TYPE_MATERIAL && name == "wc/codo_ui_viewer_black_decal3"s)
 		{
 			asset->material->sortKey = 0xE;
 		}
diff --git a/src/Components/Modules/Maps.cpp b/src/Components/Modules/Maps.cpp
index 877849a3..7ca2a43f 100644
--- a/src/Components/Modules/Maps.cpp
+++ b/src/Components/Modules/Maps.cpp
@@ -416,6 +416,7 @@ namespace Components
 		Maps::AddDependency("mp_shipment_long", "iw4x_dependencies_mp");
 		Maps::AddDependency("mp_firingrange", "iw4x_dependencies_mp"); 
 		Maps::AddDependency("mp_rust_long", "iw4x_dependencies_mp");
+		Maps::AddDependency("mp_rust_long", "mp_rust");
 
 #if defined(DEBUG) && defined(ENABLE_DXSDK)
 		Command::Add("dumpmap", [] (Command::Params)
diff --git a/src/Components/Modules/Zones.cpp b/src/Components/Modules/Zones.cpp
index 3f6968bf..f30456c3 100644
--- a/src/Components/Modules/Zones.cpp
+++ b/src/Components/Modules/Zones.cpp
@@ -1006,7 +1006,7 @@ namespace Components
 			{
 				arg->paramID -= 3;
 
-				if (Zones::Version() >= 359)
+				if (Zones::Version() >= 359/* && arg->paramID <= 113*/)
 				{
 					arg->paramID -= 7;
 				}