diff --git a/gbscreen.cpp b/gbscreen.cpp
index 277b654..165b555 100644
--- a/gbscreen.cpp
+++ b/gbscreen.cpp
@@ -176,7 +176,7 @@ namespace gbscreen
     void fill_line_buffer_win(uint8_t LY)
     {
         const uint8_t LCDC = mem::readMem(0xff40);
-        if ((LCDC & 0x21) == 0) return;
+        if ((LCDC & 0x21) != 0x21) return;
         const uint8_t WY = mem::readMem(0xff4a);
         if (LY<WY) return;
         const uint8_t WX = mem::readMem(0xff4b);
@@ -341,8 +341,8 @@ namespace gbscreen
                 }
                 if (LY==LYC)
                 {
-                    STAT = (STAT & 0xFB) | 0x40;
-                    if (STAT&0x04) stat_interrupt = true;
+                    STAT = (STAT & 0xFB) | 0x04;
+                    if (STAT&0x40) stat_interrupt = true;
                 }
                 else
                 {
diff --git a/sm83.cpp b/sm83.cpp
index bc33957..0439599 100644
--- a/sm83.cpp
+++ b/sm83.cpp
@@ -483,16 +483,16 @@ namespace sm83
             rPC = 0x40;
             mem::writeMem(0xff0f, IF & ~INTERRUPT_VBLANK);
         } else if (IF & INTERRUPT_LCD) {
-            rPC = 0x40;
+            rPC = 0x48;
             mem::writeMem(0xff0f, IF & ~INTERRUPT_LCD);
         } else if (IF & INTERRUPT_TIMER) {
-            rPC = 0x40;
+            rPC = 0x50;
             mem::writeMem(0xff0f, IF & ~INTERRUPT_TIMER);
         } else if (IF & INTERRUPT_SERIAL) {
-            rPC = 0x40;
+            rPC = 0x58;
             mem::writeMem(0xff0f, IF & ~INTERRUPT_SERIAL);
         } else if (IF & INTERRUPT_JOYPAD) {
-            rPC = 0x40;
+            rPC = 0x60;
             mem::writeMem(0xff0f, IF & ~INTERRUPT_JOYPAD);
         }
         /*if (options[Z80_OPTION_BREAK_ON_INTERRUPT]) {