diff --git a/OpenRA.Game/Widgets/ButtonWidget.cs b/OpenRA.Game/Widgets/ButtonWidget.cs
index ac1554f8c4..bec066dc26 100644
--- a/OpenRA.Game/Widgets/ButtonWidget.cs
+++ b/OpenRA.Game/Widgets/ButtonWidget.cs
@@ -120,8 +120,6 @@ namespace OpenRA.Widgets
 			};
 
 			Widget.RootWidget.AddChild(fullscreenMask);
-
-			var origin = w.RenderOrigin;
 			var dropDown = new ScrollPanelWidget
 			{
 				Bounds = new Rectangle(w.RenderOrigin.X, w.RenderOrigin.Y + w.Bounds.Height, w.Bounds.Width, 100),
@@ -149,7 +147,6 @@ namespace OpenRA.Widgets
 
 			foreach (var t in ts)
 			{
-				var tt = t;
 				var ww = ft(t, dropDown.Bounds.Width);
 				var origMouseUp = ww.OnMouseUp;
 				ww.OnMouseUp = mi => { var result = origMouseUp(mi); HideDropDown(); return result; };
diff --git a/OpenRA.Mods.RA/Scripting/RASpecialPowers.cs b/OpenRA.Mods.RA/Scripting/RASpecialPowers.cs
index eb4dd1df71..dddb5539f7 100644
--- a/OpenRA.Mods.RA/Scripting/RASpecialPowers.cs
+++ b/OpenRA.Mods.RA/Scripting/RASpecialPowers.cs
@@ -33,8 +33,6 @@ namespace OpenRA.Scripting
 			{									
 				var target = kv.First;
 				var targetCell = kv.Second;
-				System.Console.WriteLine("{0} {1}",target, targetCell);
-				
 				var cs = target.Trait<Chronoshiftable>();
 				if (cs.CanChronoshiftTo(target, targetCell))
 					target.Trait<Chronoshiftable>().Teleport(target,
diff --git a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
index 8d99702b4c..4c6130db3a 100755
--- a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
@@ -209,15 +209,16 @@ namespace OpenRA.Mods.RA
 				foreach (var t in world.FindTilesInCircle(xy, range))
 					sourceTile.DrawAt( wr, Game.CellSize * t, "terrain" );
 				
-				// Unit tiles
+				// Unit previews
 				foreach (var unit in power.UnitsInRange(sourceLocation))
 				{
 					var targetCell = unit.Location + xy - sourceLocation;
-					var canEnter = unit.Trait<Chronoshiftable>().CanChronoshiftTo(unit,targetCell);
 					foreach (var r in unit.Render())
 						r.Sprite.DrawAt(wr, r.Pos - Traits.Util.CenterOfCell(unit.Location) + Traits.Util.CenterOfCell(targetCell),
 						                r.Palette ?? unit.Owner.Palette);
 				}
+				
+				// Unit tiles
 				foreach (var unit in power.UnitsInRange(sourceLocation))
 				{
 					var targetCell = unit.Location + xy - sourceLocation;
diff --git a/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs b/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs
index df916c5c6e..0421b0252e 100755
--- a/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs
@@ -97,15 +97,10 @@ namespace OpenRA.Mods.RA
 
 			IEnumerable<Order> OrderInner(World world, int2 xy, MouseInput mi)
 			{
-				if (mi.Button == MouseButton.Left)
+				if (mi.Button == MouseButton.Left && power.UnitsInRange(xy).Any() )
 				{
-					var targetUnits = power.UnitsInRange(xy);
-
-					if( targetUnits.Any() )
-					{
-						world.CancelInputMode();
-						yield return new Order("IronCurtain", world.LocalPlayer.PlayerActor, false) { TargetLocation = xy };
-					}
+					world.CancelInputMode();
+					yield return new Order("IronCurtain", world.LocalPlayer.PlayerActor, false) { TargetLocation = xy };
 				}
 			}
 
@@ -122,7 +117,6 @@ namespace OpenRA.Mods.RA
 			public void RenderAfterWorld(WorldRenderer wr, World world)
 			{
 				var xy = Game.viewport.ViewToWorld(Viewport.LastMousePos).ToInt2();
-				var targetUnits = power.UnitsInRange(xy);
 				foreach (var unit in power.UnitsInRange(xy))
 					wr.DrawSelectionBox(unit, Color.Red);
 			}
@@ -130,8 +124,7 @@ namespace OpenRA.Mods.RA
 			public void RenderBeforeWorld(WorldRenderer wr, World world)
 			{
 				var xy = Game.viewport.ViewToWorld(Viewport.LastMousePos).ToInt2();
-				var tiles = world.FindTilesInCircle(xy, range);
-				foreach (var t in tiles)
+				foreach (var t in world.FindTilesInCircle(xy, range))
 					tile.DrawAt( wr, Game.CellSize * t, "terrain" );
 			}