diff --git a/OpenRA.Game/Traits/AI/AutoTarget.cs b/OpenRA.Game/Traits/AI/AutoTarget.cs
index 43451c3ae8..6ac327491a 100644
--- a/OpenRA.Game/Traits/AI/AutoTarget.cs
+++ b/OpenRA.Game/Traits/AI/AutoTarget.cs
@@ -31,6 +31,7 @@ namespace OpenRA.Traits
 
 	class AutoTarget : ITick, INotifyDamage
 	{
+		[Sync]
 		int nextScanTime = 0;
 
 		void AttackTarget(Actor self, Actor target)
diff --git a/OpenRA.Game/Traits/AI/SelfHealing.cs b/OpenRA.Game/Traits/AI/SelfHealing.cs
index 19e2a5defa..b3ab7fe906 100644
--- a/OpenRA.Game/Traits/AI/SelfHealing.cs
+++ b/OpenRA.Game/Traits/AI/SelfHealing.cs
@@ -31,9 +31,9 @@ namespace OpenRA.Traits
 
 	class SelfHealing : ITick
 	{
+		[Sync]
 		int ticks;
 
-
 		public void Tick(Actor self)
 		{
 			var info = self.Info.Traits.Get<SelfHealingInfo>();
diff --git a/OpenRA.Game/Traits/Player/PlaceBuilding.cs b/OpenRA.Game/Traits/Player/PlaceBuilding.cs
index 7716f5ef62..dfdb9b9a2e 100644
--- a/OpenRA.Game/Traits/Player/PlaceBuilding.cs
+++ b/OpenRA.Game/Traits/Player/PlaceBuilding.cs
@@ -36,9 +36,8 @@ namespace OpenRA.Traits
 					var unit = Rules.Info[ order.TargetString ];
 					var producing = queue.CurrentItem(unit.Category);
 					
-					// Breaks linebuild
-					//if( producing == null || producing.Item != order.TargetString || producing.RemainingTime != 0 )
-					//	return;
+					if( producing == null || producing.Item != order.TargetString || producing.RemainingTime != 0 )
+						return;
 					
 					var building = self.World.CreateActor( order.TargetString, order.TargetLocation, order.Player );