diff --git a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
index 1f92222917..99d6ca0db5 100644
--- a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
+++ b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
@@ -102,8 +102,8 @@ namespace OpenRA.Mods.RA
 		
 		void SetGunboatPath()
 		{
-			Actors["Gunboat"].QueueActivity(new Move( Map.Waypoints["gunboatRight"],1));
 			Actors["Gunboat"].QueueActivity(new Move( Map.Waypoints["gunboatLeft"],1));
+			Actors["Gunboat"].QueueActivity(new Move( Map.Waypoints["gunboatRight"],1));
 			Actors["Gunboat"].QueueActivity(new CallFunc(() => SetGunboatPath()));
 		}
 		
diff --git a/OpenRA.Mods.RA/AutoTarget.cs b/OpenRA.Mods.RA/AutoTarget.cs
index ba341e212c..83031e31a5 100644
--- a/OpenRA.Mods.RA/AutoTarget.cs
+++ b/OpenRA.Mods.RA/AutoTarget.cs
@@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA
 
 		public void Tick(Actor self)
 		{
-			if (!self.IsIdle) return;
+			if (!self.IsIdle && self.Info.Traits.Get<AutoTargetInfo>().AllowMovement) return;
 
 			if (--nextScanTime <= 0)
 			{
diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml
index 131f631bc5..09a8ac3045 100644
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -331,7 +331,7 @@ Actors:
 		Location: 53,59
 		Owner: GoodGuy
 		Health: 1
-		Facing: 192
+		Facing: 64
 		ActorStance: Hunt
 	Actor88: e1
 		Location: 56,55
diff --git a/mods/cnc/vehicles.yaml b/mods/cnc/vehicles.yaml
index d3776c219b..2f58bfe49d 100644
--- a/mods/cnc/vehicles.yaml
+++ b/mods/cnc/vehicles.yaml
@@ -537,6 +537,7 @@ BOAT:
 		PrimaryLocalOffset: -3,-5,0,3,-5,0,0,-5,0
 	RenderGunboat:
 	AutoTarget:
+		AllowMovement: false
 
 LST:
 	Inherits: ^Ship