diff --git a/OpenRA.Mods.RA/Render/RenderBuilding.cs b/OpenRA.Mods.RA/Render/RenderBuilding.cs
index 67a53e2df74b..a805ae879f27 100755
--- a/OpenRA.Mods.RA/Render/RenderBuilding.cs
+++ b/OpenRA.Mods.RA/Render/RenderBuilding.cs
@@ -51,7 +51,7 @@ public RenderBuilding( ActorInitializer init, RenderBuildingInfo info, Func<int>
 				self.QueueActivity(new MakeAnimation(self));
 			
 			// Can't call Complete() from ctor because other traits haven't been inited yet
-			self.QueueActivity(new CallFunc(() => self.World.AddFrameEndTask( _ => Complete( self ) )));
+			self.QueueActivity(new CallFunc(() => Complete(self)));
 		}
 		
 		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
diff --git a/OpenRA.Mods.RA/Render/RenderBuildingOre.cs b/OpenRA.Mods.RA/Render/RenderBuildingOre.cs
index d91af1271ba7..4e20ec4a9ee8 100755
--- a/OpenRA.Mods.RA/Render/RenderBuildingOre.cs
+++ b/OpenRA.Mods.RA/Render/RenderBuildingOre.cs
@@ -29,8 +29,10 @@ public RenderBuildingOre( ActorInitializer init, RenderBuildingInfo info )
 
 		public void BuildingComplete( Actor self )
 		{
-			anim.PlayFetchIndex( "idle", 
-				() => (49 * PlayerResources.Ore) / (10*PlayerResources.OreCapacity));
+			anim.PlayFetchIndex("idle",
+				() => PlayerResources.OreCapacity != 0
+					? (49 * PlayerResources.Ore) / (10 * PlayerResources.OreCapacity)
+					: 0);
 		}
 		
 		public void OnCapture (Actor self, Actor captor, Player oldOwner, Player newOwner)
diff --git a/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs b/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs
index 6d85301f2ded..63326a7fded6 100644
--- a/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs
+++ b/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs
@@ -18,14 +18,9 @@ class RenderBuildingTurretedInfo : RenderBuildingInfo
 		public override object Create(ActorInitializer init) { return new RenderBuildingTurreted( init, this ); }
 	}
 
-	class RenderBuildingTurreted : RenderBuilding, INotifyBuildComplete
+	class RenderBuildingTurreted : RenderBuilding
 	{
 		public RenderBuildingTurreted( ActorInitializer init, RenderBuildingInfo info )
 			: base(init, info, () => init.self.Trait<Turreted>().turretFacing) { }
-
-		public void BuildingComplete( Actor self )
-		{
-			anim.Play( "idle" );
-		}
 	}
 }