diff --git a/src/GBACart.cpp b/src/GBACart.cpp
index a3b38888..772ca587 100644
--- a/src/GBACart.cpp
+++ b/src/GBACart.cpp
@@ -865,13 +865,13 @@ std::unique_ptr<CartCommon> LoadAddon(int type, void* userdata)
         cart = std::make_unique<CartRumblePak>(userdata);
         break;
     case GBAAddon_MotionPakHomebrew:
-        Cart = std::make_unique<CartMotionPakHomebrew>(userdata);
+        cart = std::make_unique<CartMotionPakHomebrew>(userdata);
         break;
     case GBAAddon_MotionPakRetail:
-        Cart = std::make_unique<CartMotionPakRetail>(userdata);
+        cart = std::make_unique<CartMotionPakRetail>(userdata);
         break;
     case GBAAddon_GuitarGrip:
-        Cart = std::make_unique<CartGuitarGrip>(userdata);
+        cart = std::make_unique<CartGuitarGrip>(userdata);
         break;
 
     default:
diff --git a/src/GBACartMotionPak.cpp b/src/GBACartMotionPak.cpp
index 44743464..c213bb7f 100644
--- a/src/GBACartMotionPak.cpp
+++ b/src/GBACartMotionPak.cpp
@@ -161,7 +161,7 @@ void CartMotionPakRetail::DoSavestate(Savestate* file)
 
 u16 CartMotionPakRetail::ROMRead(u32 addr) const
 {
-    // CHECKME: Retail cartridge seems to return 0x7C7C.
+    // A9-A8 is pulled low on a real Motion Pack.
     return 0xFCFF;
 }