diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 48cf1edd44..16c5c88344 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -270,6 +270,7 @@
     <Compile Include="Traits\World\ScreenShaker.cs" />
     <Compile Include="Traits\LineBuild.cs" />
     <Compile Include="Traits\World\Theater.cs" />
+    <Compile Include="Traits\Cloak.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/OpenRA.Mods.Cnc/Cloak.cs b/OpenRA.Game/Traits/Cloak.cs
similarity index 94%
rename from OpenRA.Mods.Cnc/Cloak.cs
rename to OpenRA.Game/Traits/Cloak.cs
index 583162a33c..0803e511fb 100644
--- a/OpenRA.Mods.Cnc/Cloak.cs
+++ b/OpenRA.Game/Traits/Cloak.cs
@@ -20,10 +20,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Traits;
 
-
-namespace OpenRA.Mods.Cnc
+namespace OpenRA.Traits
 {
 	class CloakInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
index 50d4330025..892e9b38a5 100644
--- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
@@ -48,7 +48,6 @@
     <Compile Include="ProductionAirdrop.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TiberiumRefinery.cs" />
-    <Compile Include="Cloak.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/OpenRA.Mods.Cnc/ProductionAirdrop.cs b/OpenRA.Mods.Cnc/ProductionAirdrop.cs
index 0c97976100..16b4a13671 100644
--- a/OpenRA.Mods.Cnc/ProductionAirdrop.cs
+++ b/OpenRA.Mods.Cnc/ProductionAirdrop.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
  * This file is part of OpenRA.
@@ -37,9 +37,9 @@ namespace OpenRA.Mods.Cnc
 		{
 			var owner = self.Owner;
 			
-			// Start beyond the edge of the map, to give a finite delay, and ability to land when AFLD is on map edge
+			// Start and end beyond the edge of the map, to give a finite delay, and ability to land when AFLD is on map edge
 			var startPos = new int2(owner.World.Map.XOffset + owner.World.Map.Width+15, self.Location.Y);
-			var endPos = new int2(owner.World.Map.XOffset, self.Location.Y);
+			var endPos = new int2(owner.World.Map.XOffset-15, self.Location.Y);
 			var unloadOffset = new int2(1,1);
 			var exitOffset = new int2(3,1);
 			
diff --git a/mods/aftermath/rules.yaml b/mods/aftermath/rules.yaml
index 69c33ff4e6..cf03c104a0 100644
--- a/mods/aftermath/rules.yaml
+++ b/mods/aftermath/rules.yaml
@@ -32,7 +32,9 @@ STNK:
 		PrimaryWeapon: APTusk
 		Recoil: 2
 	RenderUnitTurreted:
-;	Cloak:
+	Cloak:
+		CloakSound:ironcur9.aud
+		UncloakSound:ironcur9.aud
 
 TTNK:
 	Inherits: ^Vehicle
diff --git a/mods/cnc/sequences.xml b/mods/cnc/sequences.xml
index 0b7abadaad..b725337e39 100644
--- a/mods/cnc/sequences.xml
+++ b/mods/cnc/sequences.xml
@@ -50,8 +50,8 @@
   </unit>
 
 <!-- Notes on explosions:
-cnc does not recognize water explosions, so these will cause problems (missing art)
-it also defines the following sets of explosions that we are not using all of: 
+these are mostly broken now that we don't depend on RA
+cnc mixen also include the following sets of explosions that we are not using all of: 
 	frag1, frag3 : medium explosions
 	napalm1, napalm2, napalm3 : small, medium, large fire
 	veh-hit1, veh-hit2, veh-hit3