diff --git a/zsnes/src/cpu/regs.inc b/zsnes/src/cpu/regs.inc
index de416b4d..1a5df324 100644
--- a/zsnes/src/cpu/regs.inc
+++ b/zsnes/src/cpu/regs.inc
@@ -695,7 +695,7 @@ reg213Er:
 
 ; PPU Status Flag & Version number (NTSC/PAL/EXTRN Latch flag)
 reg213Fr:
-    mov byte[debstop3],1
+;    mov byte[debstop3],1
     mov al,[romispal]
     shl al,4
     or al,[cfield]
diff --git a/zsnes/src/cpu/regsw.inc b/zsnes/src/cpu/regsw.inc
index db854db8..d7bf2f7c 100644
--- a/zsnes/src/cpu/regsw.inc
+++ b/zsnes/src/cpu/regsw.inc
@@ -494,6 +494,7 @@ reg2101w:
 
 ; OAM address register
 reg2102w:
+    mov word[oamaddr],0
     shr word[oamaddr],1
     mov [oamaddr],al
     shl word[oamaddr],1
@@ -553,7 +554,7 @@ reg2104w:
     je .noinc
     inc dword[oamaddr]
     cmp ebx,544
-    je .overflow
+    jae .overflow
 .noinc
     mov [oamram+ebx],al
     ret