diff --git a/src/pic.c b/src/pic.c
index 6999aa6d8..56a6a927f 100644
--- a/src/pic.c
+++ b/src/pic.c
@@ -236,12 +236,7 @@ pic_update_pending_at(void)
     if (!(pic2.flags & PIC_FREEZE)) {
         pic2.int_pending = (find_best_interrupt(&pic2) != -1);
 
-        // pic_cascade(pic2.int_pending);
-
-        if (pic2.int_pending)
-            pic.irr |= (1 << pic2.icw3);
-        else
-            pic.irr &= ~(1 << pic2.icw3);
+        pic_cascade(pic2.int_pending);
     }
 
     if (!(pic.flags & PIC_FREEZE))
diff --git a/src/video/vid_herculesplus.c b/src/video/vid_herculesplus.c
index a70182b90..0c2c0270c 100644
--- a/src/video/vid_herculesplus.c
+++ b/src/video/vid_herculesplus.c
@@ -365,7 +365,6 @@ draw_char_ram48(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
     unsigned             olc = 0;
     unsigned             val;
     unsigned             ibg;
-    unsigned             ifg = 0;
     unsigned             cfg;
     const unsigned char *fnt;
     int                  cw    = HERCULESPLUS_CW;