diff --git a/Classes/MutLPVehicleMods.uc b/Classes/MutLPVehicleMods.uc
index c589eef..f0d87ad 100644
--- a/Classes/MutLPVehicleMods.uc
+++ b/Classes/MutLPVehicleMods.uc
@@ -118,6 +118,8 @@ function SetVehicleWeapon(out MutLPVehicleModsVehicle vehicle, bool driver, int
 		wclass = class'LionsPhilMut.ONSMASCannonAlwaysDeployed';
 	}
 
+	// TODO Cicada needs a similar exception to use ONSLinkableWeapon
+
 	// Set weaponclsdrv/pas appropriately
 	if(driver) {
 		vehicle.weaponclsdrv[idx] = wclass;
@@ -138,7 +140,6 @@ function SetVehicleWeapon(out MutLPVehicleModsVehicle vehicle, bool driver, int
 	// If this weapon is of charging type, disable impulse
 	if(weapon.charging) {
 		vehicle.pcimpulse = 0.0;
-		log(">>>>> This vehicle " $ vehicle.dname $ " has a charging weapon, so its impulse has been zero'd.");
 	}
 
 	// Debugging trace
@@ -216,7 +217,6 @@ function BeginPlay() { // Care not for Zones or Volumes, so don't need to wait u
 
 		// End stonking great lump. Have a nice day!
 
-        log(">>> " $ vehicle.dname $ " has impulse of " $ vehicle.pcimpulse);
 		vehicles[vindex] = vehicle; // Yeah, you WISH it were a reference!
 	}
 }
diff --git a/Classes/MutLPVehicleMods.uc.src b/Classes/MutLPVehicleMods.uc.src
index f8a0bcd..20bb72f 100644
--- a/Classes/MutLPVehicleMods.uc.src
+++ b/Classes/MutLPVehicleMods.uc.src
@@ -89,9 +89,11 @@ function SetVehicleWeapon(out MutLPVehicleModsVehicle vehicle, bool driver, int
 
 	// Apply special case for Leviathan main cannon
 	if((wclass == class'OnslaughtFull.ONSMASCannon') && (vehicle.cfgname != "leviathan")) {
-		wclass = class'MutLPVehicleMods.ONSMASCannonAlwaysDeployed';
+		wclass = class'LionsPhilMut.ONSMASCannonAlwaysDeployed';
 	}
 
+	// TODO Cicada needs a similar exception to use ONSLinkableWeapon
+
 	// Set weaponclsdrv/pas appropriately
 	if(driver) {
 		vehicle.weaponclsdrv[idx] = wclass;
@@ -110,8 +112,9 @@ function SetVehicleWeapon(out MutLPVehicleModsVehicle vehicle, bool driver, int
 	}
 
 	// If this weapon is of charging type, disable impulse
-	if(weapon.charging)
-		{ vehicle.pcimpulse = 0.0; }
+	if(weapon.charging) {
+		vehicle.pcimpulse = 0.0;
+	}
 
 	// Debugging trace
 //	if(driver){dbg_dp="driver";}else{dbg_dp="passenger";}