diff --git a/Content.Client/Power/SolarControlWindow.xaml b/Content.Client/Power/SolarControlWindow.xaml
index 8918a87d1b..f492c97fed 100644
--- a/Content.Client/Power/SolarControlWindow.xaml
+++ b/Content.Client/Power/SolarControlWindow.xaml
@@ -1,5 +1,5 @@
 <SS14Window xmlns="https://spacestation14.io"
-            xmlns:scc="clr-namespace:Content.Client.GameObjects.Components.Power"
+            xmlns:power="clr-namespace:Content.Client.Power"
             Title="{Loc 'solar-control-window-title'}"
             Resizable="False">
     <BoxContainer Orientation="Horizontal">
@@ -26,7 +26,7 @@
 
             <Label Text="{Loc 'solar-control-window-press-enter-to-confirm'}"/><Label Text=""/>
         </GridContainer>
-        <scc:SolarControlNotARadar Name="NotARadar"/>
+        <power:SolarControlNotARadar Name="NotARadar"/>
     </BoxContainer>
 </SS14Window>
 
diff --git a/Content.Client/Power/SolarControlWindow.xaml.cs b/Content.Client/Power/SolarControlWindow.xaml.cs
index 5ced2ae49d..f56c46ca8f 100644
--- a/Content.Client/Power/SolarControlWindow.xaml.cs
+++ b/Content.Client/Power/SolarControlWindow.xaml.cs
@@ -1,21 +1,19 @@
 using System;
-using JetBrains.Annotations;
+using Content.Client.GameObjects.Components;
 using Content.Shared.Solar;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
-using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.XAML;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.GameObjects;
+using Robust.Client.UserInterface.XAML;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.Power
 {
     [GenerateTypedNameReferences]
     public sealed partial class SolarControlWindow : SS14Window, IComputerWindow<SolarControlConsoleBoundInterfaceState>
@@ -31,7 +29,7 @@ namespace Content.Client.GameObjects.Components.Power
         {
             PanelRotation.OnTextEntered += (text) => {
                 double value;
-                if (double.TryParse(text.Text, out value))
+                if (double.TryParse((string?) text.Text, out value))
                 {
                     SolarControlConsoleAdjustMessage msg = new SolarControlConsoleAdjustMessage();
                     msg.Rotation = Angle.FromDegrees(value);
@@ -44,7 +42,7 @@ namespace Content.Client.GameObjects.Components.Power
             };
             PanelVelocity.OnTextEntered += (text) => {
                 double value;
-                if (double.TryParse(text.Text, out value))
+                if (double.TryParse((string?) text.Text, out value))
                 {
                     SolarControlConsoleAdjustMessage msg = new SolarControlConsoleAdjustMessage();
                     msg.Rotation = NotARadar.PredictedPanelRotation;
diff --git a/RobustToolbox b/RobustToolbox
index 325f25c547..3a86c827ea 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 325f25c5479434f3174cca48aa4129f307bb9bcc
+Subproject commit 3a86c827ea02f46b213f473f6479fbfaed35095e