diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs
index dbc8949625..9dca57e81e 100644
--- a/OpenRa.Game/Game.cs
+++ b/OpenRa.Game/Game.cs
@@ -158,13 +158,13 @@ namespace OpenRa
 						controller.selection.Tick(world);
 
 						world.Tick();
+
+						PerfHistory.Tick();
 					}
 					else
 						if (orderManager.FrameNumber == 0)
 							lastTime = Environment.TickCount;
 				}
-
-				PerfHistory.Tick();
 			}
 
 			using (new PerfSample("render"))
diff --git a/OpenRa.Game/Traits/ProvidesRadar.cs b/OpenRa.Game/Traits/ProvidesRadar.cs
index 03bc6abcfc..764839777e 100644
--- a/OpenRa.Game/Traits/ProvidesRadar.cs
+++ b/OpenRa.Game/Traits/ProvidesRadar.cs
@@ -2,7 +2,10 @@
 
 namespace OpenRa.Traits
 {
-	class ProvidesRadarInfo : StatelessTraitInfo<ProvidesRadar> {}
+	class ProvidesRadarInfo : ITraitInfo
+	{
+		public object Create( Actor self ) { return new ProvidesRadar(); }
+	}
 
 	class ProvidesRadar : ITick
 	{
@@ -14,7 +17,7 @@ namespace OpenRa.Traits
 		{
 			// Check if powered
 			var b = self.traits.Get<Building>();
-			if (b != null && b.Disabled) return false;
+			if (b.Disabled) return false;
 
 			var isJammed = self.World.Queries.WithTrait<JamsRadar>().Any(a => self.Owner != a.Actor.Owner
 				&& (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<JamsRadarInfo>().Range);