diff --git a/Ryujinx.HLE/OsHle/Services/Am/ICommonStateGetter.cs b/Ryujinx.HLE/OsHle/Services/Am/ICommonStateGetter.cs
index 0a29b8f3..3276f066 100644
--- a/Ryujinx.HLE/OsHle/Services/Am/ICommonStateGetter.cs
+++ b/Ryujinx.HLE/OsHle/Services/Am/ICommonStateGetter.cs
@@ -20,14 +20,14 @@ namespace Ryujinx.HLE.OsHle.Services.Am
         {
             m_Commands = new Dictionary<int, ServiceProcessRequest>()
             {
-                { 0, GetEventHandle                          },
-                { 1, ReceiveMessage                          },
-                { 5, GetOperationMode                        },
-                { 6, GetPerformanceMode                      },
-                { 8, GetBootMode                             },
-                { 9, GetCurrentFocusState                    },
-                { 60, GetDefaultDisplayResolution            },
-                { 61, GetDefaultDisplayResolutionChangeEvent }
+                { 0,  GetEventHandle                          },
+                { 1,  ReceiveMessage                          },
+                { 5,  GetOperationMode                        },
+                { 6,  GetPerformanceMode                      },
+                { 8,  GetBootMode                             },
+                { 9,  GetCurrentFocusState                    },
+                { 60, GetDefaultDisplayResolution             },
+                { 61, GetDefaultDisplayResolutionChangeEvent  }
             };
 
             DisplayResolutionChangeEvent = new KEvent();
@@ -69,7 +69,7 @@ namespace Ryujinx.HLE.OsHle.Services.Am
         {
             Apm.PerformanceMode Mode = DockedMode ? Apm.PerformanceMode.Docked : Apm.PerformanceMode.Handheld;
 
-            Context.ResponseData.Write((byte)Mode);
+            Context.ResponseData.Write((int)Mode);
 
             return 0;
         }
diff --git a/Ryujinx.HLE/OsHle/SystemStateMgr.cs b/Ryujinx.HLE/OsHle/SystemStateMgr.cs
index 87e3de1e..7d14f0a5 100644
--- a/Ryujinx.HLE/OsHle/SystemStateMgr.cs
+++ b/Ryujinx.HLE/OsHle/SystemStateMgr.cs
@@ -37,7 +37,7 @@ namespace Ryujinx.HLE.OsHle
 
         internal string ActiveAudioOutput { get; private set; }
         
-        public bool DockedMode { get; set; }
+        public static bool DockedMode { get; set; }
 
         public SystemStateMgr()
         {