diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs
index fcc16c8254..9e127b74f5 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs
@@ -19,45 +19,45 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 		[ObjectCreator.UseCtor]
 		public CncCheatsLogic(Widget widget, Action onExit, World world)
 		{
-			var panel = widget.GetWidget("CHEATS_PANEL");
+			var panel = widget;
 
 			var devTrait = world.LocalPlayer.PlayerActor.Trait<DeveloperMode>();
-			var shroudCheckbox = panel.GetWidget<CheckboxWidget>("SHROUD_CHECKBOX");
+			var shroudCheckbox = panel.GetWidget<CheckboxWidget>("DISABLE_SHROUD");
 			shroudCheckbox.IsChecked = () => devTrait.DisableShroud;
 			shroudCheckbox.OnClick = () => Order(world, "DevShroud");
 
-			var pathCheckbox = panel.GetWidget<CheckboxWidget>("PATHDEBUG_CHECKBOX");
+			var pathCheckbox = panel.GetWidget<CheckboxWidget>("SHOW_UNIT_PATHS");
 			pathCheckbox.IsChecked = () => devTrait.PathDebug;
 			pathCheckbox.OnClick = () => Order(world, "DevPathDebug");
 
 
-			panel.GetWidget<ButtonWidget>("GIVE_CASH_BUTTON").OnClick = () =>
+			panel.GetWidget<ButtonWidget>("GIVE_CASH").OnClick = () =>
 				world.IssueOrder(new Order("DevGiveCash", world.LocalPlayer.PlayerActor, false));
 
-			var fastBuildCheckbox = panel.GetWidget<CheckboxWidget>("INSTANT_BUILD_CHECKBOX");
+			var fastBuildCheckbox = panel.GetWidget<CheckboxWidget>("INSTANT_BUILD");
 			fastBuildCheckbox.IsChecked = () => devTrait.FastBuild;
 			fastBuildCheckbox.OnClick = () => Order(world, "DevFastBuild");
 
-			var fastChargeCheckbox = panel.GetWidget<CheckboxWidget>("INSTANT_CHARGE_CHECKBOX");
+			var fastChargeCheckbox = panel.GetWidget<CheckboxWidget>("INSTANT_CHARGE");
 			fastChargeCheckbox.IsChecked = () => devTrait.FastCharge;
 			fastChargeCheckbox.OnClick = () => Order(world, "DevFastCharge");
 
-			var allTechCheckbox = panel.GetWidget<CheckboxWidget>("ENABLE_TECH_CHECKBOX");
+			var allTechCheckbox = panel.GetWidget<CheckboxWidget>("ENABLE_TECH");
 			allTechCheckbox.IsChecked = () => devTrait.AllTech;
 			allTechCheckbox.OnClick = () => Order(world, "DevEnableTech");
 
-			var powerCheckbox = panel.GetWidget<CheckboxWidget>("UNLIMITED_POWER_CHECKBOX");
+			var powerCheckbox = panel.GetWidget<CheckboxWidget>("UNLIMITED_POWER");
 			powerCheckbox.IsChecked = () => devTrait.UnlimitedPower;
 			powerCheckbox.OnClick = () => Order(world, "DevUnlimitedPower");
 
-			var buildAnywhereCheckbox = panel.GetWidget<CheckboxWidget>("BUILD_ANYWHERE_CHECKBOX");
+			var buildAnywhereCheckbox = panel.GetWidget<CheckboxWidget>("BUILD_ANYWHERE");
 			buildAnywhereCheckbox.IsChecked = () => devTrait.BuildAnywhere;
 			buildAnywhereCheckbox.OnClick = () => Order(world, "DevBuildAnywhere");
 
-			panel.GetWidget<ButtonWidget>("GIVE_EXPLORATION_BUTTON").OnClick = () =>
+			panel.GetWidget<ButtonWidget>("GIVE_EXPLORATION").OnClick = () =>
 				world.IssueOrder(new Order("DevGiveExploration", world.LocalPlayer.PlayerActor, false));
 
-			panel.GetWidget<ButtonWidget>("CLOSE_BUTTON").OnClick = () => { Ui.CloseWindow(); onExit(); };
+			panel.GetWidget<ButtonWidget>("CLOSE").OnClick = () => { Ui.CloseWindow(); onExit(); };
 		}
 
 		public void Order(World world, string order)
diff --git a/OpenRA.Mods.RA/Effects/LaserZap.cs b/OpenRA.Mods.RA/Effects/LaserZap.cs
index 7111bf8c4d..d4de3e53bf 100755
--- a/OpenRA.Mods.RA/Effects/LaserZap.cs
+++ b/OpenRA.Mods.RA/Effects/LaserZap.cs
@@ -88,6 +88,8 @@ namespace OpenRA.Mods.RA.Effects
 			var wlr = Game.Renderer.WorldLineRenderer;
 			wlr.LineWidth = info.BeamRadius * 2;
 			wlr.DrawLine(args.src, args.dest, rc, rc);
+			wlr.Flush();
+			wlr.LineWidth = 1f;
 		}
 	}
 }
diff --git a/mods/cnc/chrome/cheats.yaml b/mods/cnc/chrome/cheats.yaml
index 801bae5cbb..05e54df373 100644
--- a/mods/cnc/chrome/cheats.yaml
+++ b/mods/cnc/chrome/cheats.yaml
@@ -47,19 +47,19 @@ Container@CHEATS_PANEL:
 					Width:200
 					Height:20
 					Text:Instant Charge Time				
-				Checkbox@CHECKBOX_SHROUD:
+				Checkbox@DISABLE_SHROUD:
 					X:400
 					Y:15
 					Height:20
 					Width:200
 					Text:Disable Shroud
-				Checkbox@CHECKBOX_PATHDEBUG:
+				Checkbox@SHOW_UNIT_PATHS:
 					X:400
 					Y:45
 					Width:200
 					Height:20
 					Text:Show Unit Paths
-		Button@CLOSE_BUTTON:
+		Button@CLOSE:
 			Key:escape
 			X:0
 			Y:109
@@ -77,4 +77,4 @@ Container@CHEATS_PANEL:
 			Y:109
 			Width:140
 			Height:35
-			Text:Give Exploration
\ No newline at end of file
+			Text:Give Exploration