diff --git a/bootstrap/unix-44/Out.c b/bootstrap/unix-44/Out.c
index 38e680ae..4c3982b5 100644
--- a/bootstrap/unix-44/Out.c
+++ b/bootstrap/unix-44/Out.c
@@ -18,7 +18,7 @@ export void Out_Char (CHAR ch);
 export void Out_Flush (void);
 export void Out_Hex (INT64 x, INT64 n);
 export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
-export void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l);
+export void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
 export void Out_Int (INT64 x, INT64 n);
 static INT32 Out_Length (CHAR *s, ADDRESS s__len);
 export void Out_Ln (void);
@@ -150,25 +150,26 @@ void Out_Ln (void)
 	Out_Flush();
 }
 
-void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
+void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length)
 {
-	INT32 i, n, lim;
+	INT16 i;
+	INT32 n, lim;
 	CHAR c;
-	lim = a + l;
-	while (a < lim) {
-		if (a + 16 < lim) {
+	lim = adr + length;
+	while (adr < lim) {
+		if (adr + 16 < lim) {
 			n = 16;
 		} else {
-			n = lim - a;
+			n = lim - adr;
 		}
-		Out_Hex(o, 8);
+		Out_Hex(offset, 8);
 		Out_Char(' ');
 		i = 0;
 		while (i < n) {
 			if (__MASK(i, -4) == 0) {
 				Out_Char(' ');
 			}
-			__GET(a + i, c, CHAR);
+			__GET(adr + i, c, CHAR);
 			Out_Hex((INT16)c, 2);
 			Out_Char(' ');
 			i += 1;
@@ -183,7 +184,7 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
 		Out_String((CHAR*)" ", 2);
 		i = 0;
 		while (i < n) {
-			__GET(a + i, c, CHAR);
+			__GET(adr + i, c, CHAR);
 			if ((INT16)c < 32 || (INT16)c > 126) {
 				Out_Char('.');
 			} else {
@@ -191,8 +192,8 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
 			}
 			i += 1;
 		}
-		a += n;
-		o += n;
+		adr += n;
+		offset += (INT64)n;
 		Out_Ln();
 	}
 }
diff --git a/bootstrap/unix-44/Out.h b/bootstrap/unix-44/Out.h
index bae3e220..1db1f1b3 100644
--- a/bootstrap/unix-44/Out.h
+++ b/bootstrap/unix-44/Out.h
@@ -13,7 +13,7 @@ import void Out_Char (CHAR ch);
 import void Out_Flush (void);
 import void Out_Hex (INT64 x, INT64 n);
 import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
-import void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l);
+import void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
 import void Out_Int (INT64 x, INT64 n);
 import void Out_Ln (void);
 import void Out_LongReal (LONGREAL x, INT16 n);
diff --git a/bootstrap/unix-48/Out.c b/bootstrap/unix-48/Out.c
index 38e680ae..4c3982b5 100644
--- a/bootstrap/unix-48/Out.c
+++ b/bootstrap/unix-48/Out.c
@@ -18,7 +18,7 @@ export void Out_Char (CHAR ch);
 export void Out_Flush (void);
 export void Out_Hex (INT64 x, INT64 n);
 export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
-export void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l);
+export void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
 export void Out_Int (INT64 x, INT64 n);
 static INT32 Out_Length (CHAR *s, ADDRESS s__len);
 export void Out_Ln (void);
@@ -150,25 +150,26 @@ void Out_Ln (void)
 	Out_Flush();
 }
 
-void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
+void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length)
 {
-	INT32 i, n, lim;
+	INT16 i;
+	INT32 n, lim;
 	CHAR c;
-	lim = a + l;
-	while (a < lim) {
-		if (a + 16 < lim) {
+	lim = adr + length;
+	while (adr < lim) {
+		if (adr + 16 < lim) {
 			n = 16;
 		} else {
-			n = lim - a;
+			n = lim - adr;
 		}
-		Out_Hex(o, 8);
+		Out_Hex(offset, 8);
 		Out_Char(' ');
 		i = 0;
 		while (i < n) {
 			if (__MASK(i, -4) == 0) {
 				Out_Char(' ');
 			}
-			__GET(a + i, c, CHAR);
+			__GET(adr + i, c, CHAR);
 			Out_Hex((INT16)c, 2);
 			Out_Char(' ');
 			i += 1;
@@ -183,7 +184,7 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
 		Out_String((CHAR*)" ", 2);
 		i = 0;
 		while (i < n) {
-			__GET(a + i, c, CHAR);
+			__GET(adr + i, c, CHAR);
 			if ((INT16)c < 32 || (INT16)c > 126) {
 				Out_Char('.');
 			} else {
@@ -191,8 +192,8 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
 			}
 			i += 1;
 		}
-		a += n;
-		o += n;
+		adr += n;
+		offset += (INT64)n;
 		Out_Ln();
 	}
 }
diff --git a/bootstrap/unix-48/Out.h b/bootstrap/unix-48/Out.h
index bae3e220..1db1f1b3 100644
--- a/bootstrap/unix-48/Out.h
+++ b/bootstrap/unix-48/Out.h
@@ -13,7 +13,7 @@ import void Out_Char (CHAR ch);
 import void Out_Flush (void);
 import void Out_Hex (INT64 x, INT64 n);
 import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
-import void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l);
+import void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
 import void Out_Int (INT64 x, INT64 n);
 import void Out_Ln (void);
 import void Out_LongReal (LONGREAL x, INT16 n);
diff --git a/bootstrap/unix-88/Out.c b/bootstrap/unix-88/Out.c
index 64345041..c9c42bdb 100644
--- a/bootstrap/unix-88/Out.c
+++ b/bootstrap/unix-88/Out.c
@@ -18,7 +18,7 @@ export void Out_Char (CHAR ch);
 export void Out_Flush (void);
 export void Out_Hex (INT64 x, INT64 n);
 export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
-export void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l);
+export void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length);
 export void Out_Int (INT64 x, INT64 n);
 static INT32 Out_Length (CHAR *s, ADDRESS s__len);
 export void Out_Ln (void);
@@ -150,25 +150,26 @@ void Out_Ln (void)
 	Out_Flush();
 }
 
-void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l)
+void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length)
 {
-	INT64 i, n, lim;
+	INT16 i;
+	INT64 n, lim;
 	CHAR c;
-	lim = a + l;
-	while (a < lim) {
-		if (a + 16 < lim) {
+	lim = adr + (INT64)length;
+	while (adr < lim) {
+		if (adr + 16 < lim) {
 			n = 16;
 		} else {
-			n = lim - a;
+			n = lim - adr;
 		}
-		Out_Hex(o, 8);
+		Out_Hex(offset, 8);
 		Out_Char(' ');
 		i = 0;
-		while (i < n) {
+		while ((INT64)i < n) {
 			if (__MASK(i, -4) == 0) {
 				Out_Char(' ');
 			}
-			__GET(a + i, c, CHAR);
+			__GET(adr + (INT64)i, c, CHAR);
 			Out_Hex((INT16)c, 2);
 			Out_Char(' ');
 			i += 1;
@@ -182,8 +183,8 @@ void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l)
 		}
 		Out_String((CHAR*)" ", 2);
 		i = 0;
-		while (i < n) {
-			__GET(a + i, c, CHAR);
+		while ((INT64)i < n) {
+			__GET(adr + (INT64)i, c, CHAR);
 			if ((INT16)c < 32 || (INT16)c > 126) {
 				Out_Char('.');
 			} else {
@@ -191,8 +192,8 @@ void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l)
 			}
 			i += 1;
 		}
-		a += n;
-		o += n;
+		adr += n;
+		offset += n;
 		Out_Ln();
 	}
 }
diff --git a/bootstrap/unix-88/Out.h b/bootstrap/unix-88/Out.h
index 6962abdc..24829244 100644
--- a/bootstrap/unix-88/Out.h
+++ b/bootstrap/unix-88/Out.h
@@ -13,7 +13,7 @@ import void Out_Char (CHAR ch);
 import void Out_Flush (void);
 import void Out_Hex (INT64 x, INT64 n);
 import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
-import void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l);
+import void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length);
 import void Out_Int (INT64 x, INT64 n);
 import void Out_Ln (void);
 import void Out_LongReal (LONGREAL x, INT16 n);
diff --git a/bootstrap/windows-48/Out.c b/bootstrap/windows-48/Out.c
index f5e37537..767779ee 100644
--- a/bootstrap/windows-48/Out.c
+++ b/bootstrap/windows-48/Out.c
@@ -18,7 +18,7 @@ export void Out_Char (CHAR ch);
 export void Out_Flush (void);
 export void Out_Hex (INT64 x, INT64 n);
 export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
-export void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l);
+export void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
 export void Out_Int (INT64 x, INT64 n);
 static INT32 Out_Length (CHAR *s, ADDRESS s__len);
 export void Out_Ln (void);
@@ -150,25 +150,26 @@ void Out_Ln (void)
 	Out_Flush();
 }
 
-void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
+void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length)
 {
-	INT32 i, n, lim;
+	INT16 i;
+	INT32 n, lim;
 	CHAR c;
-	lim = a + l;
-	while (a < lim) {
-		if (a + 16 < lim) {
+	lim = adr + length;
+	while (adr < lim) {
+		if (adr + 16 < lim) {
 			n = 16;
 		} else {
-			n = lim - a;
+			n = lim - adr;
 		}
-		Out_Hex(o, 8);
+		Out_Hex(offset, 8);
 		Out_Char(' ');
 		i = 0;
 		while (i < n) {
 			if (__MASK(i, -4) == 0) {
 				Out_Char(' ');
 			}
-			__GET(a + i, c, CHAR);
+			__GET(adr + i, c, CHAR);
 			Out_Hex((INT16)c, 2);
 			Out_Char(' ');
 			i += 1;
@@ -183,7 +184,7 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
 		Out_String((CHAR*)" ", 2);
 		i = 0;
 		while (i < n) {
-			__GET(a + i, c, CHAR);
+			__GET(adr + i, c, CHAR);
 			if ((INT16)c < 32 || (INT16)c > 126) {
 				Out_Char('.');
 			} else {
@@ -191,8 +192,8 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
 			}
 			i += 1;
 		}
-		a += n;
-		o += n;
+		adr += n;
+		offset += (INT64)n;
 		Out_Ln();
 	}
 }
diff --git a/bootstrap/windows-48/Out.h b/bootstrap/windows-48/Out.h
index bae3e220..1db1f1b3 100644
--- a/bootstrap/windows-48/Out.h
+++ b/bootstrap/windows-48/Out.h
@@ -13,7 +13,7 @@ import void Out_Char (CHAR ch);
 import void Out_Flush (void);
 import void Out_Hex (INT64 x, INT64 n);
 import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
-import void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l);
+import void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
 import void Out_Int (INT64 x, INT64 n);
 import void Out_Ln (void);
 import void Out_LongReal (LONGREAL x, INT16 n);
diff --git a/bootstrap/windows-88/Out.c b/bootstrap/windows-88/Out.c
index b0d58957..4e33a095 100644
--- a/bootstrap/windows-88/Out.c
+++ b/bootstrap/windows-88/Out.c
@@ -18,7 +18,7 @@ export void Out_Char (CHAR ch);
 export void Out_Flush (void);
 export void Out_Hex (INT64 x, INT64 n);
 export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
-export void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l);
+export void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length);
 export void Out_Int (INT64 x, INT64 n);
 static INT32 Out_Length (CHAR *s, ADDRESS s__len);
 export void Out_Ln (void);
@@ -150,25 +150,26 @@ void Out_Ln (void)
 	Out_Flush();
 }
 
-void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l)
+void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length)
 {
-	INT64 i, n, lim;
+	INT16 i;
+	INT64 n, lim;
 	CHAR c;
-	lim = a + l;
-	while (a < lim) {
-		if (a + 16 < lim) {
+	lim = adr + (INT64)length;
+	while (adr < lim) {
+		if (adr + 16 < lim) {
 			n = 16;
 		} else {
-			n = lim - a;
+			n = lim - adr;
 		}
-		Out_Hex(o, 8);
+		Out_Hex(offset, 8);
 		Out_Char(' ');
 		i = 0;
-		while (i < n) {
+		while ((INT64)i < n) {
 			if (__MASK(i, -4) == 0) {
 				Out_Char(' ');
 			}
-			__GET(a + i, c, CHAR);
+			__GET(adr + (INT64)i, c, CHAR);
 			Out_Hex((INT16)c, 2);
 			Out_Char(' ');
 			i += 1;
@@ -182,8 +183,8 @@ void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l)
 		}
 		Out_String((CHAR*)" ", 2);
 		i = 0;
-		while (i < n) {
-			__GET(a + i, c, CHAR);
+		while ((INT64)i < n) {
+			__GET(adr + (INT64)i, c, CHAR);
 			if ((INT16)c < 32 || (INT16)c > 126) {
 				Out_Char('.');
 			} else {
@@ -191,8 +192,8 @@ void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l)
 			}
 			i += 1;
 		}
-		a += n;
-		o += n;
+		adr += n;
+		offset += n;
 		Out_Ln();
 	}
 }
diff --git a/bootstrap/windows-88/Out.h b/bootstrap/windows-88/Out.h
index 6962abdc..24829244 100644
--- a/bootstrap/windows-88/Out.h
+++ b/bootstrap/windows-88/Out.h
@@ -13,7 +13,7 @@ import void Out_Char (CHAR ch);
 import void Out_Flush (void);
 import void Out_Hex (INT64 x, INT64 n);
 import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
-import void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l);
+import void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length);
 import void Out_Int (INT64 x, INT64 n);
 import void Out_Ln (void);
 import void Out_LongReal (LONGREAL x, INT16 n);