diff --git a/Source/Glide64/Config.cpp b/Source/Glide64/Config.cpp
index 96947d13e..f2cdc99af 100644
--- a/Source/Glide64/Config.cpp
+++ b/Source/Glide64/Config.cpp
@@ -321,7 +321,7 @@ public:
         COMMAND_HANDLER_EX(IDC_CBXANISOTROPIC, BN_CLICKED, ItemChanged)
         COMMAND_HANDLER_EX(IDC_CHK_SHOW_TEXTURE_ENHANCEMENT, BN_CLICKED, ItemChanged)
         COMMAND_HANDLER_EX(IDC_CHK_AUTODETECT_VRAM, BN_CLICKED, ItemChanged)
-	COMMAND_HANDLER_EX(IDC_CHK_USE_FRAME_BUFFER_OBJECT, BN_CLICKED, ItemChanged)
+        COMMAND_HANDLER_EX(IDC_CHK_USE_FRAME_BUFFER_OBJECT, BN_CLICKED, ItemChanged)
         CHAIN_MSG_MAP(CToolTipDialog<CConfigBasicPage>)
         CHAIN_MSG_MAP(CPropertyPageImpl<CConfigBasicPage>)
     END_MSG_MAP()
@@ -451,7 +451,7 @@ public:
         g_settings->wrpResolution = m_cmbFSResolution.GetCurSel();
         g_settings->wrpAnisotropic = m_cbxAnisotropic.GetCheck() == BST_CHECKED;
         g_settings->wrpVRAM = m_cbxVRAM.GetCheck() == BST_CHECKED ? 0 : atoi(spinVRAM);
-	g_settings->wrpFBO = m_cbxFBO.GetCheck() == BST_CHECKED;
+        g_settings->wrpFBO = m_cbxFBO.GetCheck() == BST_CHECKED;
 
         if (memcmp(&oldsettings, g_settings, sizeof(oldsettings))) //check that settings were changed
         {
diff --git a/Source/Project64-core/N64System/Recompiler/CodeSection.cpp b/Source/Project64-core/N64System/Recompiler/CodeSection.cpp
index f44d13031..24cf8dcb3 100644
--- a/Source/Project64-core/N64System/Recompiler/CodeSection.cpp
+++ b/Source/Project64-core/N64System/Recompiler/CodeSection.cpp
@@ -376,23 +376,22 @@ void CCodeSection::GenerateSectionLinkage()
             m_RecompilerOps->SetRegWorkingSet(JumpInfo[i]->RegSet);
             if (JumpInfo[i]->TargetPC <= JumpInfo[i]->JumpPC)
             {
-                m_RecompilerOps->UpdateCounters(JumpInfo[i]->RegSet, true, true);
+                m_RecompilerOps->UpdateCounters(m_RecompilerOps->GetRegWorkingSet(), true, true);
                 if (JumpInfo[i]->PermLoop)
                 {
                     CPU_Message("PermLoop *** 3");
-                    m_RecompilerOps->CompileInPermLoop(JumpInfo[i]->RegSet, JumpInfo[i]->TargetPC);
+                    m_RecompilerOps->CompileInPermLoop(m_RecompilerOps->GetRegWorkingSet(), JumpInfo[i]->TargetPC);
                 }
                 else
                 {
                     CPU_Message("CompileSystemCheck 9");
-                    m_RecompilerOps->CompileSystemCheck(JumpInfo[i]->TargetPC, JumpInfo[i]->RegSet);
+                    m_RecompilerOps->CompileSystemCheck(JumpInfo[i]->TargetPC, m_RecompilerOps->GetRegWorkingSet());
                 }
             }
             else
             {
                 m_RecompilerOps->UpdateCounters(m_RecompilerOps->GetRegWorkingSet(), false, true);
             }
-            m_RecompilerOps->SetRegWorkingSet(JumpInfo[i]->RegSet);
             m_RecompilerOps->SyncRegState(TargetSection[i]->m_RegEnter);
             m_RecompilerOps->JumpToSection(TargetSection[i]);
         }