diff --git a/configure.py b/configure.py
index 92f2b574..6a5e1516 100755
--- a/configure.py
+++ b/configure.py
@@ -81,7 +81,7 @@ LIBS = [
             "MetroidPrime/HUD/CSamusHud",
             "MetroidPrime/CAnimationDatabaseGame",
             "MetroidPrime/CTransitionDatabaseGame",
-            ["MetroidPrime/Tweaks/CTweakPlayerControl", False],
+            ["MetroidPrime/Tweaks/CTweakPlayerControl", True],
             "MetroidPrime/Tweaks/CTweakPlayerGun",
             "MetroidPrime/CPauseScreen",
             "MetroidPrime/Tweaks/CTweakGui",
diff --git a/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp b/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp
index 7319dc39..8fde91fb 100644
--- a/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp
+++ b/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp
@@ -12,15 +12,15 @@
 class CInputStream;
 class CTweakPlayerControl;
 
-class CTweakPlayerControl : public ITweakObject, public TOneStatic< CTweakPlayerControl > {
+class CTweakPlayerControl : public ITweakObject {
 public:
   CTweakPlayerControl(CInputStream&);
   ~CTweakPlayerControl() override;
 
   ControlMapper::EFunctionList GetMapping(ControlMapper::ECommands command) const;
-  
+
 private:
-  rstl::reserved_vector<ControlMapper::EFunctionList, 67> m_mappings;
+  rstl::reserved_vector< ControlMapper::EFunctionList, 67 > m_mappings;
 };
 
 #endif // _CTWEAKPLAYERCONTROL
diff --git a/obj_files.mk b/obj_files.mk
index f3f1cc37..7fa9565d 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -48,7 +48,7 @@ METROIDPRIME :=\
 	$(BUILD_DIR)/asm/MetroidPrime/HUD/CSamusHud.o\
 	$(BUILD_DIR)/asm/MetroidPrime/CAnimationDatabaseGame.o\
 	$(BUILD_DIR)/asm/MetroidPrime/CTransitionDatabaseGame.o\
-	$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakPlayerControl.o\
+	$(BUILD_DIR)/src/MetroidPrime/Tweaks/CTweakPlayerControl.o\
 	$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakPlayerGun.o\
 	$(BUILD_DIR)/asm/MetroidPrime/CPauseScreen.o\
 	$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakGui.o\
diff --git a/src/MetroidPrime/Tweaks/CTweakPlayerControl.cpp b/src/MetroidPrime/Tweaks/CTweakPlayerControl.cpp
index 319796ae..e1df235b 100644
--- a/src/MetroidPrime/Tweaks/CTweakPlayerControl.cpp
+++ b/src/MetroidPrime/Tweaks/CTweakPlayerControl.cpp
@@ -7,7 +7,7 @@ CTweakPlayerControl::~CTweakPlayerControl() {}
 rstl::reserved_vector< ControlMapper::EFunctionList, 67 > LoadMappings(CInputStream& in) {
   rstl::reserved_vector< ControlMapper::EFunctionList, 67 > result;
   for (int i = 0; i < result.capacity(); ++i) {
-    result.push_back(static_cast<ControlMapper::EFunctionList>(in.ReadLong()));
+    result.push_back(static_cast< ControlMapper::EFunctionList >(in.ReadLong()));
   }
   return result;
 }
@@ -18,6 +18,6 @@ ControlMapper::EFunctionList
 CTweakPlayerControl::GetMapping(ControlMapper::ECommands command) const {
   if (command < ControlMapper::kC_Forward || command > ControlMapper::kC_UNKNOWN - 1)
     return m_mappings[0];
-  
+
   return m_mappings[command];
 }