diff --git a/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs b/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs
index 2bf34586b2..3df7791d1c 100644
--- a/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs
+++ b/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs
@@ -40,8 +40,10 @@ namespace Content.Client.GameObjects
         private ScreenEffects _currentEffect = ScreenEffects.None;
 
         // Required dependencies
+#pragma warning disable 649
         [Dependency] private readonly IOverlayManager _overlayManager;
         [Dependency] private readonly IPlayerManager _playerManager;
+#pragma warning restore 649
 
         //Relevant interface implementation for the character UI controller
         public Control Scene => _window;
diff --git a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs b/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs
index df36c995ce..49fbfde363 100644
--- a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs
+++ b/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs
@@ -11,8 +11,10 @@ namespace Content.Client.Graphics.Overlays
 {
     public class CircleMaskOverlay : Overlay
     {
+#pragma warning disable 649
         [Dependency] private readonly IPrototypeManager _prototypeManager;
         [Dependency] private readonly IEyeManager _eyeManager;
+#pragma warning restore 649
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
diff --git a/Content.Client/Graphics/Overlays/GradientCircleMask.cs b/Content.Client/Graphics/Overlays/GradientCircleMask.cs
index 9897f06cbd..a06ccfe941 100644
--- a/Content.Client/Graphics/Overlays/GradientCircleMask.cs
+++ b/Content.Client/Graphics/Overlays/GradientCircleMask.cs
@@ -11,9 +11,10 @@ namespace Content.Client.Graphics.Overlays
 {
     public class GradientCircleMask : Overlay
     {
+#pragma warning disable 649
         [Dependency] private readonly IPrototypeManager _prototypeManager;
         [Dependency] private readonly IEyeManager _eyeManager;
-
+#pragma warning restore 649
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
         public GradientCircleMask() : base(nameof(GradientCircleMask))
diff --git a/Content.Client/Parallax/ParallaxManager.cs b/Content.Client/Parallax/ParallaxManager.cs
index a30e647de5..b94e7f4f24 100644
--- a/Content.Client/Parallax/ParallaxManager.cs
+++ b/Content.Client/Parallax/ParallaxManager.cs
@@ -33,7 +33,6 @@ namespace Content.Client.Parallax
         public async void LoadParallax()
         {
             MemoryStream configStream = null;
-            long crcValue;
             string contents;
             TomlTable table;
             try
diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs
index 2b043cc04e..7c4f1af45e 100644
--- a/Content.Client/UserInterface/HandsGui.cs
+++ b/Content.Client/UserInterface/HandsGui.cs
@@ -43,13 +43,13 @@ namespace Content.Client.UserInterface
         {
             base.Initialize();
 
-            var _resMgr = IoCManager.Resolve<IResourceCache>();
-            var handsBoxTexture = _resMgr.GetResource<TextureResource>("/Textures/UserInterface/handsbox.png");
+            var resMgr = IoCManager.Resolve<IResourceCache>();
+            var handsBoxTexture = resMgr.GetResource<TextureResource>("/Textures/UserInterface/handsbox.png");
             handBox = new StyleBoxTexture()
             {
                 Texture = handsBoxTexture,
             };
-            handBox.SetMargin(StyleBox.Margin.All, 6);
+            handBox.SetPatchMargin(StyleBox.Margin.All, 6);
             inactiveHandBox = new StyleBoxTexture(handBox)
             {
                 Modulate = _inactiveColor,
diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs
index 08e97963e6..65c24e2069 100644
--- a/Content.Client/UserInterface/NanoStyle.cs
+++ b/Content.Client/UserInterface/NanoStyle.cs
@@ -38,7 +38,7 @@ namespace Content.Client.UserInterface
             {
                 Texture =  windowBackgroundTex,
             };
-            windowBackground.SetMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
+            windowBackground.SetPatchMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
             windowBackground.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
 
             var buttonNormalTex = resCache.GetResource<TextureResource>("/Nano/button_normal.png").Texture;
@@ -46,7 +46,7 @@ namespace Content.Client.UserInterface
             {
                 Texture = buttonNormalTex,
             };
-            buttonNormal.SetMargin(StyleBox.Margin.All, 2);
+            buttonNormal.SetPatchMargin(StyleBox.Margin.All, 2);
             buttonNormal.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
 
             var buttonHoverTex = resCache.GetResource<TextureResource>("/Nano/button_hover.png").Texture;
@@ -54,7 +54,7 @@ namespace Content.Client.UserInterface
             {
                 Texture = buttonHoverTex,
             };
-            buttonHover.SetMargin(StyleBox.Margin.All, 2);
+            buttonHover.SetPatchMargin(StyleBox.Margin.All, 2);
             buttonHover.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
 
             var buttonPressedTex = resCache.GetResource<TextureResource>("/Nano/button_pressed.png").Texture;
@@ -62,7 +62,7 @@ namespace Content.Client.UserInterface
             {
                 Texture = buttonPressedTex,
             };
-            buttonPressed.SetMargin(StyleBox.Margin.All, 2);
+            buttonPressed.SetPatchMargin(StyleBox.Margin.All, 2);
             buttonPressed.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
 
             var buttonDisabledTex = resCache.GetResource<TextureResource>("/Nano/button_disabled.png").Texture;
@@ -70,7 +70,7 @@ namespace Content.Client.UserInterface
             {
                 Texture = buttonDisabledTex,
             };
-            buttonDisabled.SetMargin(StyleBox.Margin.All, 2);
+            buttonDisabled.SetPatchMargin(StyleBox.Margin.All, 2);
             buttonDisabled.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);