diff --git a/ALTAIR/altair_sys.c b/ALTAIR/altair_sys.c
index 291a256d..0453f8f7 100644
--- a/ALTAIR/altair_sys.c
+++ b/ALTAIR/altair_sys.c
@@ -153,7 +153,7 @@ int32 oplen[256] = {
    load starts at the current value of the PC.
 */
 
-int32 sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
+t_stat sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
 {
 int32 i, addr = 0, cnt = 0;
 
@@ -180,7 +180,7 @@ return (SCPE_OK);
         status  =       error code
 */
 
-int32 fprint_sym (FILE *of, t_addr addr, uint32 *val,
+t_stat fprint_sym (FILE *of, t_addr addr, t_value *val,
     UNIT *uptr, int32 sw)
 {
 int32 cflag, c1, c2, inst, adr;
@@ -229,7 +229,7 @@ return -(oplen[inst] - 1);
         status  =       error status
 */
 
-int32 parse_sym (char *cptr, t_addr addr, UNIT *uptr, uint32 *val, int32 sw)
+t_stat parse_sym (char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
 {
 int32 cflag, i = 0, j, r;
 char gbuf[CBUFSIZE];
diff --git a/AltairZ80/altairz80_cpu.c b/AltairZ80/altairz80_cpu.c
index af2ab14e..dc4c0d46 100644
--- a/AltairZ80/altairz80_cpu.c
+++ b/AltairZ80/altairz80_cpu.c
@@ -191,7 +191,6 @@ void setBankSelect(const int32 b);
 uint32 getClockFrequency(void);
 void setClockFrequency(const uint32 Value);
 uint32 getCommon(void);
-t_stat sim_load(FILE *fileref, char *cptr, char *fnam, int32 flag);
 uint32 sim_map_resource(uint32 baseaddr, uint32 size, uint32 resource_type,
         int32 (*routine)(const int32, const int32, const int32), uint8 unmap);
 
@@ -6810,7 +6809,7 @@ void (*sim_vm_init) (void) = &altairz80_init;
 
 #define PLURAL(x) (x), (x) == 1 ? "" : "s"
 
-t_stat sim_load(FILE *fileref, char *cptr, char *fnam, int32 flag) {
+t_stat sim_load(FILE *fileref, char *cptr, char *fnam, int flag) {
     int32 i;
     uint32 addr, cnt = 0, org, pagesModified = 0, makeROM = FALSE;
     t_addr j, lo, hi;
diff --git a/H316/h316_cpu.c b/H316/h316_cpu.c
index fe827ef8..52110867 100644
--- a/H316/h316_cpu.c
+++ b/H316/h316_cpu.c
@@ -290,9 +290,6 @@ t_stat cpu_show_dma (FILE *st, UNIT *uptr, int32 val, void *desc);
 t_stat cpu_set_nchan (UNIT *uptr, int32 val, char *cptr, void *desc);
 t_stat cpu_show_nchan (FILE *st, UNIT *uptr, int32 val, void *desc);
 
-extern t_stat fprint_sym (FILE *of, t_addr addr, t_value *val,
-    UNIT *uptr, int32 sw);
-
 /* CPU data structures
 
    cpu_dev      CPU device descriptor
@@ -1586,8 +1583,6 @@ char *cptr = (char *) desc;
 t_value sim_eval;
 t_stat r;
 InstHistory *h;
-extern t_stat fprint_sym (FILE *ofile, t_addr addr, t_value *val,
-    UNIT *uptr, int32 sw);
 static uint8 has_opnd[16] = {
     0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1
     };
diff --git a/HP2100/hp2100_defs.h b/HP2100/hp2100_defs.h
index 5df86335..2f65fe9d 100644
--- a/HP2100/hp2100_defs.h
+++ b/HP2100/hp2100_defs.h
@@ -467,7 +467,6 @@ extern void   hp_enbdis_pair (DEVICE *ccp, DEVICE *dcp);
 
 /* System functions */
 
-extern t_stat      fprint_sym (FILE *ofile, t_addr addr, t_value *val, UNIT *uptr, int32 sw);
 extern const char *fmt_char   (uint8 ch);
 extern t_stat      hp_setsc   (UNIT *uptr, int32 val, char *cptr, void *desc);
 extern t_stat      hp_showsc  (FILE *st, UNIT *uptr, int32 val, void *desc);
diff --git a/PDP11/pdp11_cpu.c b/PDP11/pdp11_cpu.c
index 81fd1ecb..96049f30 100644
--- a/PDP11/pdp11_cpu.c
+++ b/PDP11/pdp11_cpu.c
@@ -3111,8 +3111,6 @@ char *cptr = (char *) desc;
 t_value sim_eval[HIST_ILNT];
 t_stat r;
 InstHistory *h;
-extern t_stat fprint_sym (FILE *ofile, t_addr addr, t_value *val,
-    UNIT *uptr, int32 sw);
 
 if (hst_lnt == 0)                                       /* enabled? */
     return SCPE_NOFNC;
diff --git a/S3/s3_sys.c b/S3/s3_sys.c
index 0c26cfbb..dacdd2d7 100644
--- a/S3/s3_sys.c
+++ b/S3/s3_sys.c
@@ -225,7 +225,7 @@ char regname[15][8] =  {    "(P2IAR)",
    load starts at the current value of the P1IAR.
 */
 
-int32 sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
+t_stat sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
 {
 int32 i, addr = 0, cnt = 0;
 
@@ -252,7 +252,7 @@ return (SCPE_OK);
         status  =       error code
 */
 
-int32 fprint_sym (FILE *of, t_addr addr, uint32 *val,
+t_stat fprint_sym (FILE *of, t_addr addr, t_value *val,
     UNIT *uptr, int32 sw)
 {
     int32 r;
@@ -501,7 +501,7 @@ return -(oplen - 1);
         status  =       error status
 */
 
-int32 parse_sym (char *cptr, t_addr addr, UNIT *uptr, uint32 *val, int32 sw)
+t_stat parse_sym (char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
 {
 int32 cflag, i = 0, j, r, oplen, addtyp, saveaddr, vptr;
 char gbuf[CBUFSIZE];
diff --git a/TX-0/tx0_cpu.c b/TX-0/tx0_cpu.c
index 4bb03d38..0fbda2a6 100644
--- a/TX-0/tx0_cpu.c
+++ b/TX-0/tx0_cpu.c
@@ -1208,7 +1208,7 @@ cpu_get_switches(void)
     return TAC;
 }
 
-t_stat sim_load(FILE *fileref, char *cptr, char *fnam, int32 flag) {
+t_stat sim_load(FILE *fileref, char *cptr, char *fnam, int flag) {
     uint32 cnt = 0, word;
     t_addr j, lo, hi, sz, sz_words;
     char *result;
diff --git a/alpha/alpha_cpu.c b/alpha/alpha_cpu.c
index 667b0f7a..e531bb24 100644
--- a/alpha/alpha_cpu.c
+++ b/alpha/alpha_cpu.c
@@ -1784,8 +1784,6 @@ t_stat cpu_fprint_one_inst (FILE *st, uint32 ir, t_uint64 pc, t_uint64 ra, t_uin
 {
 uint32 op;
 t_value sim_val;
-extern t_stat fprint_sym (FILE *ofile, t_addr addr, t_value *val,
-    UNIT *uptr, int32 sw);
 
 static const h_fmt[64] = {
     0,     0,     0,     0,     0,     0,     0,     0,
diff --git a/descrip.mms b/descrip.mms
index ee9e600a..106027e2 100644
--- a/descrip.mms
+++ b/descrip.mms
@@ -48,6 +48,7 @@
 #            VAX730          Just Build The DEC VAX730.
 #            VAX750          Just Build The DEC VAX750.
 #            VAX780          Just Build The DEC VAX780.
+#            VAX860          Just Build The DEC VAX860.
 #            CLEAN           Will Clean Files Back To Base Kit.
 #
 # To build with debugging enabled (which will also enable traceback 
@@ -193,6 +194,7 @@ BLD_DIR = SYS$DISK:[.BIN.VMS.LIB.BLD-$(ARCH)]
 #
 SIMH_DIR = SYS$DISK:[]
 SIMH_LIB = $(LIB_DIR)SIMH-$(ARCH).OLB
+SIMH_NONET_LIB = $(LIB_DIR)SIMH-NONET-$(ARCH).OLB
 SIMH_SOURCE = $(SIMH_DIR)SIM_CONSOLE.C,$(SIMH_DIR)SIM_SOCK.C,\
               $(SIMH_DIR)SIM_TMXR.C,$(SIMH_DIR)SIM_ETHER.C,\
               $(SIMH_DIR)SIM_TAPE.C,$(SIMH_DIR)SIM_FIO.C,\
@@ -812,6 +814,37 @@ VAX780_OPTIONS = /INCL=($(SIMH_DIR),$(VAX780_DIR),$(PDP11_DIR)$(PCAP_INC))\
 VAX780_SIMH_LIB = $(SIMH_LIB)
 .ENDIF
 
+# Digital Equipment VAX860 Simulator Definitions.
+#
+VAX860_DIR = SYS$DISK:[.VAX]
+VAX860_LIB1 = $(LIB_DIR)VAX860L1-$(ARCH).OLB
+VAX860_SOURCE1 = $(VAX860_DIR)VAX_CPU.C,$(VAX860_DIR)VAX_CPU1.C,\
+                 $(VAX860_DIR)VAX_FPA.C,$(VAX860_DIR)VAX_CIS.C,\
+                 $(VAX860_DIR)VAX_OCTA.C,$(VAX860_DIR)VAX_CMODE.C,\
+                 $(VAX860_DIR)VAX_MMU.C,$(VAX860_DIR)VAX_SYS.C,\
+                 $(VAX860_DIR)VAX_SYSCM.C,$(VAX860_DIR)VAX860_STDDEV.C,\
+                 $(VAX860_DIR)VAX860_SBIA.C,$(VAX860_DIR)VAX860_ABUS.C,\
+                 $(VAX860_DIR)VAX780_UBA.C,$(VAX860_DIR)VAX7X0_MBA.C,\
+                 $(VAX860_DIR)VAX860_SYSLIST.C
+VAX860_LIB2 = $(LIB_DIR)VAX860L2-$(ARCH).OLB
+VAX860_SOURCE2 = $(PDP11_DIR)PDP11_RL.C,$(PDP11_DIR)PDP11_RQ.C,\
+                 $(PDP11_DIR)PDP11_TS.C,$(PDP11_DIR)PDP11_DZ.C,\
+                 $(PDP11_DIR)PDP11_LP.C,$(PDP11_DIR)PDP11_TQ.C,\
+                 $(PDP11_DIR)PDP11_XU.C,$(PDP11_DIR)PDP11_RY.C,\
+                 $(PDP11_DIR)PDP11_CR.C,$(PDP11_DIR)PDP11_RP.C,\
+                 $(PDP11_DIR)PDP11_TU.C,$(PDP11_DIR)PDP11_HK.C,\
+                 $(PDP11_DIR)PDP11_VH.C,$(PDP11_DIR)PDP11_DMC.C,\
+                 $(PDP11_DIR)PDP11_IO_LIB.C
+.IFDEF ALPHA_OR_IA64
+VAX860_OPTIONS = /INCL=($(SIMH_DIR),$(VAX860_DIR),$(PDP11_DIR)$(PCAP_INC))\
+                 /DEF=($(CC_DEFS),"VM_VAX=1","USE_ADDR64=1","USE_INT64=1"$(PCAP_DEFS),"VAX_860=1")
+VAX860_SIMH_LIB = $(SIMH_LIB64)
+.ELSE
+VAX860_OPTIONS = /INCL=($(SIMH_DIR),$(VAX860_DIR),$(PDP11_DIR)$(PCAP_INC))\
+                 /DEF=($(CC_DEFS),"VM_VAX=1"$(PCAP_DEFS),"VAX_860=1")
+VAX860_SIMH_LIB = $(SIMH_LIB)
+.ENDIF
+
 # IBM 7094 Simulator Definitions.
 #
 I7094_DIR = SYS$DISK:[.I7094]
@@ -829,7 +862,7 @@ I7094_OPTIONS = /INCL=($(SIMH_DIR),$(I7094_DIR))/DEF=($(CC_DEFS))
 .IFDEF ALPHA_OR_IA64
 ALL : ALTAIR ALTAIRZ80 ECLIPSE GRI LGP H316 HP2100 I1401 I1620 IBM1130 ID16 \
       ID32 NOVA PDP1 PDP4 PDP7 PDP8 PDP9 PDP10 PDP11 PDP15 S3 \
-      VAX VAX610 VAX620 VAX630 VAX730 VAX750 VAX780 \
+      VAX VAX610 VAX620 VAX630 VAX730 VAX750 VAX780 VAX860 \
       SDS I7094 SWTP6800MP-A SWTP6800MP-A2
         $! No further actions necessary
 .ELSE
@@ -838,7 +871,7 @@ ALL : ALTAIR ALTAIRZ80 ECLIPSE GRI LGP H316 HP2100 I1401 I1620 IBM1130 ID16 \
 #
 ALL : ALTAIR ALTAIRZ80 GRI H316 HP2100 I1401 I1620 IBM1130 ID16 ID32 \
       NOVA PDP1 PDP4 PDP7 PDP8 PDP9 PDP11 PDP15 S3 \
-      VAX VAX510 VAX620 VAX630 VAX730 VAX750 VAX780 SDS \
+      VAX VAX510 VAX620 VAX630 VAX730 VAX750 VAX780 VAX860 SDS \
       SWTP6800MP-A SWTP6800MP-A2
         $! No further actions necessary
 .ENDIF
@@ -888,6 +921,17 @@ $(SIMH_LIB) : $(SIMH_SOURCE)
         $ LIBRARY/REPLACE $(MMS$TARGET) $(BLD_DIR)*.OBJ
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
+$(SIMH_NONET_LIB) : $(SIMH_SOURCE)
+        $!
+        $! Building The $(SIMH_NONET_LIB) Library.
+        $!
+        $ $(CC)/DEF=($(CC_DEFS) -
+               /OBJ=$(BLD_DIR) $(MMS$CHANGED_LIST)
+        $ IF (F$SEARCH("$(MMS$TARGET)").EQS."") THEN -
+             LIBRARY/CREATE $(MMS$TARGET)
+        $ LIBRARY/REPLACE $(MMS$TARGET) $(BLD_DIR)*.OBJ
+        $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
+
 .IFDEF ALPHA_OR_IA64
 $(SIMH_LIB64) : $(SIMH_SOURCE)
         $!
@@ -1394,6 +1438,29 @@ $(VAX780_LIB2) : $(VAX780_SOURCE2)
         $ LIBRARY/REPLACE $(MMS$TARGET) $(BLD_DIR)*.OBJ
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
+$(VAX860_LIB1) : $(VAX860_SOURCE1)
+        $!
+        $! Building The $(VAX860_LIB1) Library.
+        $!
+        $ RUN/NODEBUG $(BIN_DIR)BuildROMs-$(ARCH).EXE
+        $ $(CC)$(VAX860_OPTIONS)/OBJ=$(VAX860_DIR) -
+               /OBJ=$(BLD_DIR) $(MMS$CHANGED_LIST)
+        $ IF (F$SEARCH("$(MMS$TARGET)").EQS."") THEN -
+             LIBRARY/CREATE $(MMS$TARGET)
+        $ LIBRARY/REPLACE $(MMS$TARGET) $(BLD_DIR)*.OBJ
+        $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
+
+$(VAX860_LIB2) : $(VAX860_SOURCE2)
+        $!
+        $! Building The $(VAX860_LIB2) Library.
+        $!
+        $ $(CC)$(VAX860_OPTIONS)/OBJ=$(VAX860_DIR) -
+               /OBJ=$(BLD_DIR) $(MMS$CHANGED_LIST)
+        $ IF (F$SEARCH("$(MMS$TARGET)").EQS."") THEN -
+             LIBRARY/CREATE $(MMS$TARGET)
+        $ LIBRARY/REPLACE $(MMS$TARGET) $(BLD_DIR)*.OBJ
+        $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
+
 $(PCAP_LIB) : $(PCAP_SOURCE)
         $!
         $! Building The $(PCAP_LIB) Library.
@@ -1436,26 +1503,26 @@ $(I7094_LIB) :
 ALTAIR : $(BIN_DIR)ALTAIR-$(ARCH).EXE
         $! ALTAIR done
 
-$(BIN_DIR)ALTAIR-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(ALTAIR_LIB)
+$(BIN_DIR)ALTAIR-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(ALTAIR_LIB)
         $!
         $! Building The $(BIN_DIR)ALTAIR-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(ALTAIR_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)ALTAIR-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(ALTAIR_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(ALTAIR_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 ALTAIRZ80 : $(BIN_DIR)ALTAIRZ80-$(ARCH).EXE
         $! ALTAIRZ80 done
 
-$(BIN_DIR)ALTAIRZ80-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(ALTAIRZ80_LIB1) $(ALTAIRZ80_LIB2)
+$(BIN_DIR)ALTAIRZ80-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(ALTAIRZ80_LIB1) $(ALTAIRZ80_LIB2)
         $!
         $! Building The $(BIN_DIR)ALTAIRZ80-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(ALTAIRZ80_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)ALTAIRZ80-$(ARCH).EXE -
                $(BLD_DIR)SCP.OBJ,$(ALTAIRZ80_LIB1)/LIBRARY, -
-               $(ALTAIRZ80_LIB2)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(ALTAIRZ80_LIB2)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 #
 # If Not On VAX, Build The Eclipse Simulator.
@@ -1473,194 +1540,194 @@ ECLIPSE :
         $! Because It Requires The Use Of INT64.
 .ENDIF
 
-$(BIN_DIR)ECLIPSE-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(ECLIPSE_LIB)
+$(BIN_DIR)ECLIPSE-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(ECLIPSE_LIB)
         $!
         $! Building The $(BIN_DIR)ECLIPSE-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(ECLIPSE_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)ECLIPSE-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(ECLIPSE_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(ECLIPSE_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 GRI : $(BIN_DIR)GRI-$(ARCH).EXE
         $! GRI done
 
-$(BIN_DIR)GRI-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(GRI_LIB)
+$(BIN_DIR)GRI-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(GRI_LIB)
         $!
         $! Building The $(BIN_DIR)GRI-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(GRI_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)GRI-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(GRI_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(GRI_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 LGP : $(BIN_DIR)LGP-$(ARCH).EXE
         $! LGP done
 
-$(BIN_DIR)LGP-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(LGP_LIB)
+$(BIN_DIR)LGP-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(LGP_LIB)
         $!
         $! Building The $(BIN_DIR)LGP-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(LGP_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)LGP-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(LGP_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(LGP_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 H316 : $(BIN_DIR)H316-$(ARCH).EXE
         $! H316 done
 
-$(BIN_DIR)H316-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(H316_LIB)
+$(BIN_DIR)H316-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(H316_LIB)
         $!
         $! Building The $(BIN_DIR)H316-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(H316_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)H316-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(H316_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(H316_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 HP2100 : $(BIN_DIR)HP2100-$(ARCH).EXE
         $! HP2100 done
 
-$(BIN_DIR)HP2100-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(HP2100_LIB1) $(HP2100_LIB2)
+$(BIN_DIR)HP2100-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(HP2100_LIB1) $(HP2100_LIB2)
         $!
         $! Building The $(BIN_DIR)HP2100-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(HP2100_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)HP2100-$(ARCH).EXE -
                $(BLD_DIR)SCP.OBJ,$(HP2100_LIB1)/LIBRARY, -
-               $(HP2100_LIB2)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(HP2100_LIB2)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 I1401 : $(BIN_DIR)I1401-$(ARCH).EXE
         $! I1401 done
 
-$(BIN_DIR)I1401-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(I1401_LIB)
+$(BIN_DIR)I1401-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(I1401_LIB)
         $!
         $! Building The $(BIN_DIR)I1401-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(I1401_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)I1401-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(I1401_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(I1401_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 I1620 : $(BIN_DIR)I1620-$(ARCH).EXE
         $! I1620 done
 
-$(BIN_DIR)I1620-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(I1620_LIB)
+$(BIN_DIR)I1620-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(I1620_LIB)
         $!
         $! Building The $(BIN_DIR)I1620-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(I1620_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)I1620-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(I1620_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(I1620_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 IBM1130 : $(BIN_DIR)IBM1130-$(ARCH).EXE
         $! IBM1130 done
 
-$(BIN_DIR)IBM1130-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(IBM1130_LIB)
+$(BIN_DIR)IBM1130-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(IBM1130_LIB)
         $!
         $! Building The $(BIN_DIR)IBM1130-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(IBM1130_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)IBM1130-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(IBM1130_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(IBM1130_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 ID16 : $(BIN_DIR)ID16-$(ARCH).EXE
         $! ID16 done
 
-$(BIN_DIR)ID16-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(ID16_LIB)
+$(BIN_DIR)ID16-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(ID16_LIB)
         $!
         $! Building The $(BIN_DIR)ID16-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(ID16_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)ID16-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(ID16_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(ID16_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 ID32 : $(BIN_DIR)ID32-$(ARCH).EXE
         $! ID32 done
 
-$(BIN_DIR)ID32-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(ID32_LIB)
+$(BIN_DIR)ID32-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(ID32_LIB)
         $!
         $! Building The $(BIN_DIR)ID32-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(ID32_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)ID32-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(ID32_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(ID32_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 NOVA : $(BIN_DIR)NOVA-$(ARCH).EXE
         $! NOVA done
 
-$(BIN_DIR)NOVA-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(NOVA_LIB)
+$(BIN_DIR)NOVA-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(NOVA_LIB)
         $!
         $! Building The $(BIN_DIR)NOVA-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(NOVA_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)NOVA-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(NOVA_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(NOVA_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 PDP1 : $(BIN_DIR)PDP1-$(ARCH).EXE
         $! PDP1 done
 
-$(BIN_DIR)PDP1-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(PDP1_LIB)
+$(BIN_DIR)PDP1-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(PDP1_LIB)
         $!
         $! Building The $(BIN_DIR)PDP1-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(PDP1_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)PDP1-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(PDP1_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(PDP1_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 PDP4 : $(BIN_DIR)PDP4-$(ARCH).EXE
         $! PDP4 done
 
-$(BIN_DIR)PDP4-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(PDP4_LIB)
+$(BIN_DIR)PDP4-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(PDP4_LIB)
         $!
         $! Building The $(BIN_DIR)PDP4-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(PDP4_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)PDP4-$(ARCH).EXE -
-              $(BLD_DIR)SCP.OBJ,$(PDP4_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+              $(BLD_DIR)SCP.OBJ,$(PDP4_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 PDP7 : $(BIN_DIR)PDP7-$(ARCH).EXE
         $! PDP7 done
 
-$(BIN_DIR)PDP7-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(PDP7_LIB)
+$(BIN_DIR)PDP7-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(PDP7_LIB)
         $!
         $! Building The $(BIN_DIR)PDP7-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(PDP7_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)PDP7-$(ARCH).EXE -
-              $(BLD_DIR)SCP.OBJ,$(PDP7_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+              $(BLD_DIR)SCP.OBJ,$(PDP7_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 PDP8 : $(BIN_DIR)PDP8-$(ARCH).EXE
         $! PDP8 done
 
-$(BIN_DIR)PDP8-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(PDP8_LIB)
+$(BIN_DIR)PDP8-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(PDP8_LIB)
         $!
         $! Building The $(BIN_DIR)PDP8-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(PDP8_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)PDP8-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(PDP8_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(PDP8_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 PDP9 : $(BIN_DIR)PDP9-$(ARCH).EXE
         $! PDP9 done
 
-$(BIN_DIR)PDP9-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(PDP9_LIB)
+$(BIN_DIR)PDP9-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(PDP9_LIB)
         $!
         $! Building The $(BIN_DIR)PDP9-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(PDP9_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)PDP9-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(PDP9_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(PDP9_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 #
@@ -1670,13 +1737,13 @@ $(BIN_DIR)PDP9-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(PDP9_LIB)
 PDP10 : $(BIN_DIR)PDP10-$(ARCH).EXE
         $! PDP10 done
 
-$(BIN_DIR)PDP10-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(PCAP_LIBD) $(PDP10_LIB) $(PCAP_EXECLET)
+$(BIN_DIR)PDP10-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(PCAP_LIBD) $(PDP10_LIB) $(PCAP_EXECLET)
         $!
         $! Building The $(BIN_DIR)PDP10-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(PDP10_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)PDP10-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(PDP10_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY$(PCAP_LIBR)
+               $(BLD_DIR)SCP.OBJ,$(PDP10_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY$(PCAP_LIBR)
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 .ELSE
 #
@@ -1703,61 +1770,61 @@ $(BIN_DIR)PDP11-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(PCAP_LIBD) $(PDP11_LIB1
 PDP15 : $(BIN_DIR)PDP15-$(ARCH).EXE
         $! PDP15 done
 
-$(BIN_DIR)PDP15-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(PDP15_LIB)
+$(BIN_DIR)PDP15-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(PDP15_LIB)
         $!
         $! Building The $(BIN_DIR)PDP15-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(PDP15_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)PDP15-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(PDP15_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(PDP15_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 S3 : $(BIN_DIR)S3-$(ARCH).EXE
         $! S3 done
 
-$(BIN_DIR)S3-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(S3_LIB)
+$(BIN_DIR)S3-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(S3_LIB)
         $!
         $! Building The $(BIN_DIR)S3-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(S3_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)S3-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(S3_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(S3_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 SDS : $(BIN_DIR)SDS-$(ARCH).EXE
         $! SDS done
 
-$(BIN_DIR)SDS-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(SDS_LIB)
+$(BIN_DIR)SDS-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(SDS_LIB)
         $!
         $! Building The $(BIN_DIR)SDS-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(SDS_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)SDS-$(ARCH).EXE -
-                 $(BLD_DIR)SCP.OBJ,$(SDS_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+                 $(BLD_DIR)SCP.OBJ,$(SDS_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 SWTP6800MP-A : $(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE
         $! SWTP6800MP-A done
 
-$(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(SWTP6800MP_A_LIB)
+$(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(SWTP6800MP_A_LIB)
         $!
         $! Building The $(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(SWTP_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(SWTP6800MP_A_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(SWTP6800MP_A_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 SWTP6800MP-A2 : $(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE
         $! SWTP6800MP-A2 done
 
-$(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(SWTP6800MP_A2_LIB)
+$(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(SWTP6800MP_A2_LIB)
         $!
         $! Building The $(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(SWTP_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(SWTP6800MP_A2_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY
+               $(BLD_DIR)SCP.OBJ,$(SWTP6800MP_A2_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
 VAX : $(BIN_DIR)VAX-$(ARCH).EXE
@@ -1864,6 +1931,21 @@ $(BIN_DIR)VAX780-$(ARCH).EXE : $(SIMH_MAIN) $(VAX780_SIMH_LIB) $(PCAP_LIBD) $(VA
                $(VAX780_SIMH_LIB)/LIBRARY$(PCAP_LIBR)
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
+VAX860 : $(BIN_DIR)VAX860-$(ARCH).EXE
+        $! VAX860 done
+
+$(BIN_DIR)VAX860-$(ARCH).EXE : $(SIMH_MAIN) $(VAX860_SIMH_LIB) $(PCAP_LIBD) $(VAX860_LIB1) $(VAX860_LIB2) $(PCAP_EXECLET)
+        $!
+        $! Building The $(BIN_DIR)VAX860-$(ARCH).EXE Simulator.
+        $!
+        $ $(CC)$(VAX860_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
+        $ LINK $(LINK_DEBUG)$(LINK_SECTION_BINDING)-
+               /EXE=$(BIN_DIR)VAX860-$(ARCH).EXE -
+               $(BLD_DIR)SCP.OBJ,-
+               $(VAX860_LIB1)/LIBRARY,$(VAX860_LIB2)/LIBRARY,-
+               $(VAX860_SIMH_LIB)/LIBRARY$(PCAP_LIBR)
+        $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
+
 #
 # If Not On VAX, Build The IBM 7094 Simulator.
 #
@@ -1871,13 +1953,13 @@ $(BIN_DIR)VAX780-$(ARCH).EXE : $(SIMH_MAIN) $(VAX780_SIMH_LIB) $(PCAP_LIBD) $(VA
 I7094 : $(BIN_DIR)I7094-$(ARCH).EXE
         $! I7094 done
 
-$(BIN_DIR)I7094-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_LIB) $(I7094_LIB)
+$(BIN_DIR)I7094-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(I7094_LIB)
         $!
         $! Building The $(BIN_DIR)I7094-$(ARCH).EXE Simulator.
         $!
         $ $(CC)$(I7094_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)I7094-$(ARCH).EXE -
-               $(BLD_DIR)SCP.OBJ,$(I7094_LIB)/LIBRARY,$(SIMH_LIB)/LIBRARY$(PCAP_LIBR)
+               $(BLD_DIR)SCP.OBJ,$(I7094_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY$(PCAP_LIBR)
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 .ELSE
 #
diff --git a/scp.h b/scp.h
index 0d2bec89..56f6e184 100644
--- a/scp.h
+++ b/scp.h
@@ -170,7 +170,7 @@ extern DEVICE *sim_devices[];
 extern REG *sim_PC;
 extern const char *sim_stop_messages[];
 extern t_stat sim_instr (void);
-extern t_stat sim_load (FILE *ptr, char *cptr, char *fnam, int32 flag);
+extern t_stat sim_load (FILE *ptr, char *cptr, char *fnam, int flag);
 extern int32 sim_emax;
 extern t_stat fprint_sym (FILE *ofile, t_addr addr, t_value *val,
     UNIT *uptr, int32 sw);
diff --git a/sim_defs.h b/sim_defs.h
index e4e7164f..c00e2723 100644
--- a/sim_defs.h
+++ b/sim_defs.h
@@ -695,7 +695,7 @@ extern int32 sim_asynch_inst_latency;
 #else
 #error "Implementation of function InterlockedCompareExchangePointer() is needed to build with USE_AIO_INTRINSICS"
 #endif
-#define AIO_QUEUE_MODE "Lock free asynchronous event Queue access"
+#define AIO_QUEUE_MODE "Lock free asynchronous event queue access"
 #define AIO_QUEUE_VAL InterlockedCompareExchangePointer(&sim_asynch_queue, sim_asynch_queue, NULL)
 #define AIO_QUEUE_SET(val, queue) InterlockedCompareExchangePointer(&sim_asynch_queue, val, queue)
 #define AIO_UPDATE_QUEUE                                                         \
@@ -750,7 +750,7 @@ extern int32 sim_asynch_inst_latency;
       return SCPE_OK;                                                            \
     } else (void)0
 #else /* !USE_AIO_INTRINSICS */
-#define AIO_QUEUE_MODE "Lock based asynchronous event Queue access"
+#define AIO_QUEUE_MODE "Lock based asynchronous event queue access"
 /* This approach uses a pthread mutex to manage access to the link list     */
 /* head sim_asynch_queue.  It will always work, but may be slower than the  */
 /* lock free approach when using USE_AIO_INTRINSICS                         */
@@ -812,6 +812,7 @@ extern int32 sim_asynch_inst_latency;
         sim_asynch_inst_latency = 1;                                                            \
     } else (void)0
 #else /* !SIM_ASYNCH_IO */
+#define AIO_QUEUE_MODE "Asynchronous I/O is not available"
 #define AIO_UPDATE_QUEUE
 #define AIO_ACTIVATE(caller, uptr, event_time)
 #define AIO_VALIDATE
diff --git a/swtp6800/common/m6800.c b/swtp6800/common/m6800.c
index 5739bc29..d2e1c552 100644
--- a/swtp6800/common/m6800.c
+++ b/swtp6800/common/m6800.c
@@ -1922,7 +1922,7 @@ t_stat m6800_reset (DEVICE *dptr)
 	takes the address from the hex record or the current PC for binary.
 */
 
-int32 sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
+t_stat sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
 {
     int32 i, addr = 0, cnt = 0;
 
@@ -1950,7 +1950,7 @@ int32 sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
         for M6800
 */
 
-int32 fprint_sym (FILE *of, t_addr addr, uint32 *val, UNIT *uptr, int32 sw)
+t_stat fprint_sym (FILE *of, t_addr addr, t_value *val, UNIT *uptr, int32 sw)
 {
     int32 i, inst, inst1;
 
@@ -2005,7 +2005,7 @@ int32 fprint_sym (FILE *of, t_addr addr, uint32 *val, UNIT *uptr, int32 sw)
         status  =   error status
 */
 
-int32 parse_sym (char *cptr, t_addr addr, UNIT *uptr, uint32 *val, int32 sw)
+t_stat parse_sym (char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
 {
     return (-2);
 }