diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs
index 4f8b7e6b4..69ee6fc8b 100644
--- a/Dalamud/Dalamud.cs
+++ b/Dalamud/Dalamud.cs
@@ -246,10 +246,11 @@ namespace Dalamud {
             {
                 try
                 {
-                    PluginRepository.CleanupPlugins();
+                    this.PluginRepository.CleanupPlugins();
 
-                    PluginManager = new PluginManager(this, this.StartInfo.PluginDirectory, this.StartInfo.DefaultPluginDirectory);
-                    PluginManager.LoadPlugins();
+                    this.PluginManager =
+                        new PluginManager(this, this.StartInfo.PluginDirectory, this.StartInfo.DefaultPluginDirectory);
+                    this.PluginManager.LoadPlugins();
                 }
                 catch (Exception ex)
                 {
diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/DRKGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/DRKGauge.cs
index 5c711cf57..1cc8bed4d 100644
--- a/Dalamud/Game/ClientState/Structs/JobGauge/DRKGauge.cs
+++ b/Dalamud/Game/ClientState/Structs/JobGauge/DRKGauge.cs
@@ -9,9 +9,9 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge {
     [StructLayout(LayoutKind.Explicit)]
     public struct DRKGauge {
         [FieldOffset(0)] public byte Blood;
-        [FieldOffset(2)] public short DarksideTimeRemaining;
+        [FieldOffset(2)] public ushort DarksideTimeRemaining;
         [FieldOffset(4)] private byte DarkArtsState;
-        [FieldOffset(6)] public short ShadowTimeRemaining;
+        [FieldOffset(6)] public ushort ShadowTimeRemaining;
 
         public bool HasDarkArts() {
             return DarkArtsState > 0;