diff --git a/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_removeLaunchers.sqf b/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_removeLaunchers.sqf
index 7c17480..bd55567 100644
--- a/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_removeLaunchers.sqf
+++ b/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_removeLaunchers.sqf
@@ -13,9 +13,15 @@
 
 params["_unit"];  // = _this select 0;
 private _loadout = _unit getVariable["launcher",[[],[]]];
-
+//diag_log format["_removeLaunchers: _loadout = %1",_loadout];
+private _mags = magazines _unit;
+//diag_log format["_removeLaunchers: _mags = %1",_mags];
 {
-	unit removeMagazineGlobal _x;
+	if (_forEachIndex > 0) then 
+	{
+		//diag_log format["_removeLaunchers: _x = %1",_x];
+		_unit removeMagazines _x;
+	};
 } forEach (_loadout select 1);
 
 private _launcher = _loadout select 0;
diff --git a/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_spawnUnit.sqf b/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_spawnUnit.sqf
index 135e6b3..c1db1d2 100644
--- a/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_spawnUnit.sqf
+++ b/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_spawnUnit.sqf
@@ -70,6 +70,8 @@ _unit allowDammage true;
 _unit setBehaviour "COMBAT";
 _unit setunitpos "AUTO";
 
+/*
+// 
 if (surfaceIsWater (getPos _unit)) then 
 {
 	_uniforms = blck_UMS_uniforms;
@@ -77,6 +79,7 @@ if (surfaceIsWater (getPos _unit)) then
 	_weaponList = blck_UMS_weapons;
 	_vests = blck_UMS_vests;
 };
+*/
 _unit forceAddUniform (selectRandom _uniforms);
 if !(_headGear isEqualTo []) then 
 {