diff --git a/c64/aliases/,aliases_hardware.s b/c64/aliases/,aliases_hardware.s
index 91a117f1..63790da6 100644
--- a/c64/aliases/,aliases_hardware.s
+++ b/c64/aliases/,aliases_hardware.s
@@ -65,9 +65,13 @@
 	.label VIC_SP6COL   = $D02D
 	.label VIC_SP7COL   = $D02E
 
+#if !CONFIG_MB_MEGA_65 && !CONFIG_MB_ULTIMATE_64
+
 	.label VIC_XSCAN    = $D02F // C128 only
 	.label VIC_CLKRATE  = $D030 // C128 only
-	
+
+#endif
+
 	// SID registers
 
 	.label __SID_BASE   = $D400  // base address of the chip
@@ -161,4 +165,12 @@
 	.const BIT_CIA2_PRA_CLK_IN   = $40  // 0 - low (pulled), 1 - high (released)
 	.const BIT_CIA2_PRA_DAT_IN   = $80  // 0 - low (pulled), 1 - high (released)
 
+#if CONFIG_MB_MEGA_65 
+
+	.const C65_EXTKEYS_PR  = $D607
+	.const C65_EXTKEYS_DDR = $D608
+
+#endif
+
+
 #endif
diff --git a/c64/aliases/,aliases_petscii_codes.s b/c64/aliases/,aliases_petscii_codes.s
index c5152228..48e3abda 100644
--- a/c64/aliases/,aliases_petscii_codes.s
+++ b/c64/aliases/,aliases_petscii_codes.s
@@ -3,7 +3,8 @@
 // PETSCII codes for all the supported keys, for all the keyboards
 //
 // - [CM64]  Compute's Mapping the Commodore 64
-// - [CM128] Compute's Mapping the Commodore 128 
+// - [CM128] Compute's Mapping the Commodore 128
+// - https://github.com/MEGA65/c65-specifications/blob/master/c65manualupdated.txt
 // - https://en.wikipedia.org/wiki/PETSCII
 //
 
@@ -22,7 +23,7 @@
 
 // Note - the following PETSCII codes are currently unassigned, can be used for further extensions:
 //
-// $01, $04, $06, $0A, $0B, $0C, $0F, $82, $83, $84 
+// $01, $04, $06, $0A, $0B, $0C, $0F, $18, $82
 
 
 .const KEY_NA           = $00  // to indicate that no key is presed
@@ -31,11 +32,11 @@
 // PETSCII codes for our extended screen editor       XXX implement these
 
 .const KEY_BOTTOM       = $02  // CTRL+B            - DolphinDOS compatible
-.const KEY_TAB_FW       = $8F  // CTRL+>, TAB       - Open ROMs unofficial
-.const KEY_TAB_BW       = $80  // CTRL+<, SHIFT+TAB - Open ROMs unofficial
+.const KEY_TAB_FW       = $8F  // CTRL+>, TAB       - Open ROMs unofficial, original TAB conflicts with C64 PETSCII
+.const KEY_TAB_BW       = $80  // CTRL+<, SHIFT+TAB - Open ROMs unofficial, original TAB conflicts with C64 PETSCII
 
 
-// PETSCII codes for certain C128 and C65 functionalities                     XXX implement these
+// PETSCII codes for certain C128 and C65 functionalities     XXX implement these
 
 .const KEY_BELL         = $07  // C65 / C128, no key
 .const KEY_ESC          = $1B  // C65 / C128
@@ -43,7 +44,8 @@
 
 // PETSCII codes for programmable keys
 
-.const KEY_RUN          = $03
+.const KEY_STOP         = $03
+.const KEY_RUN          = $83
 
 .const KEY_F1           = $85
 .const KEY_F2           = $86
@@ -54,14 +56,14 @@
 .const KEY_F7           = $8B
 .const KEY_F8           = $8C
 
-.const KEY_F9           = $15  // C65, Open ROMs unofficial
-.const KEY_F10          = $16  // C65, Open ROMs unofficial
-.const KEY_F11          = $17  // C65, Open ROMs unofficial
-.const KEY_F12          = $18  // C65, Open ROMs unofficial
-.const KEY_F13          = $19  // C65, Open ROMs unofficial
-.const KEY_F14          = $1A  // C65, Open ROMs unofficial
+.const KEY_F9           = $10  // C65
+.const KEY_F10          = $15  // C65
+.const KEY_F11          = $16  // C65
+.const KEY_F12          = $17  // C65
+.const KEY_F13          = $19  // C65
+.const KEY_F14          = $1A  // C65
 
-.const KEY_HELP         = $10  // C65 / C128, Open ROMs unofficial
+.const KEY_HELP         = $84  // C65, also used for our C128 support
 
 
 // PETSCII codes for cursor keys
diff --git a/src/build_segment.cc b/src/build_segment.cc
index 3d36888d..97614123 100644
--- a/src/build_segment.cc
+++ b/src/build_segment.cc
@@ -717,7 +717,7 @@ void BinningProblem::fillGap(DualStream &logOutput, int gapAddress, const std::l
     }
     else if (!isSolved())
     {
-        logOutput << "filled in - dropped bytes: " << gaps[gapAddress] << "\n";
+        logOutput << "filled in - dropped bytes: " << gaps[gapAddress] - offset << "\n";
     }
     else
     {