diff --git a/src/ARM.cpp b/src/ARM.cpp
index 47a37bd7..5cd5d855 100644
--- a/src/ARM.cpp
+++ b/src/ARM.cpp
@@ -379,8 +379,6 @@ s32 ARM::Execute()
             }
         }
 
-        //if (R[15]==0x037F9364) printf("R8=%08X R9=%08X\n", R[8], R[9]);
-
         if (Num==0)
         {
             s32 diff = Cycles - lastcycles;
diff --git a/src/NDSCart.cpp b/src/NDSCart.cpp
index 69102b50..58d4a1ad 100644
--- a/src/NDSCart.cpp
+++ b/src/NDSCart.cpp
@@ -284,7 +284,7 @@ void Write_EEPROMTiny(u8 val, bool islast)
         }
         else
         {
-            SRAM[(Addr & 0xFF) | ((CurCmd==0x0A)?0x100:0)] = val;
+            SRAM[(Addr + ((CurCmd==0x0A)?0x100:0)) & 0x1FF] = val;
             Addr++;
         }
         break;
@@ -298,7 +298,7 @@ void Write_EEPROMTiny(u8 val, bool islast)
         }
         else
         {
-            Data = SRAM[(Addr & 0xFF) | ((CurCmd==0x0B)?0x100:0)];
+            Data = SRAM[(Addr + ((CurCmd==0x0B)?0x100:0)) & 0x1FF];
             Addr++;
         }
         break;