diff --git a/OpenRa.Game/Actor.cs b/OpenRa.Game/Actor.cs
index bf32437eaf..e126a580af 100755
--- a/OpenRa.Game/Actor.cs
+++ b/OpenRa.Game/Actor.cs
@@ -119,7 +119,7 @@ namespace OpenRa.Game
 
 		public bool IsDead { get { return Health <= 0; } }
 
-		DamageState GetDamageState()
+		public DamageState GetDamageState()
 		{
 			if (Health <= 0) return DamageState.Dead;
 			var halfStrength = Info.Strength * Rules.General.ConditionYellow;
diff --git a/OpenRa.Game/Traits/RenderBuildingCharge.cs b/OpenRa.Game/Traits/RenderBuildingCharge.cs
index abad68e9d8..671bc65062 100644
--- a/OpenRa.Game/Traits/RenderBuildingCharge.cs
+++ b/OpenRa.Game/Traits/RenderBuildingCharge.cs
@@ -15,9 +15,9 @@ namespace OpenRa.Game.Traits
 
 		public void Attacking(Actor self)
 		{
-			var prev = anim.CurrentSequence.Name;
+			var prefix = self.GetDamageState() == DamageState.Half ? "damaged-" : "";
 			Sound.Play("tslachg2.aud");
-			anim.PlayThen("active", () => anim.PlayRepeating(prev));
+			anim.PlayThen(prefix + "active", () => anim.PlayRepeating(prefix + "idle"));
 		}
 	}
 }
diff --git a/OpenRa.Game/Traits/RenderBuildingWarFactory.cs b/OpenRa.Game/Traits/RenderBuildingWarFactory.cs
index 3b34f837d7..99dda35e1c 100644
--- a/OpenRa.Game/Traits/RenderBuildingWarFactory.cs
+++ b/OpenRa.Game/Traits/RenderBuildingWarFactory.cs
@@ -28,7 +28,7 @@ namespace OpenRa.Game.Traits
 		{
 			if (doneBuilding)
 				yield return new Renderable(roof.Image, 
-					24f * (float2)self.Location, self.Owner.Palette, 2);
+					Game.CellSize * (float2)self.Location, self.Owner.Palette, 2);
 		}
 
 		public void Tick(Actor self)
diff --git a/doc/progress.txt b/doc/progress.txt
index 8330a3d28b..0013085c6c 100644
--- a/doc/progress.txt
+++ b/doc/progress.txt
@@ -31,16 +31,13 @@ HARV	Works
 ARTY	Works
 
 Helicopters
-	- Repair/rearm doesn't work
+	- Repair as FIX doesn't work
 TRAN	Cargo doesn't work
 HELI	Weapon offsets wrong
 HIND	Weapon offsets wrong
 
 Planes	
-	- AFLD reservations don't work
-	- Rearm doesn't work (should happen when on AFLD)
 	- Repair at FIX doesn't work [fix doesn't work?]
-	- Planes damage themselves (should never happen; these are AG weapons)
 YAK		Ammo/ROF are funky
 MIG		Ammo/ROF are funky