diff --git a/ALTAIR/altair_sys.c b/ALTAIR/altair_sys.c
index fa32695a..291a256d 100644
--- a/ALTAIR/altair_sys.c
+++ b/ALTAIR/altair_sys.c
@@ -180,7 +180,7 @@ return (SCPE_OK);
         status  =       error code
 */
 
-int32 fprint_sym (FILE *of, int32 addr, uint32 *val,
+int32 fprint_sym (FILE *of, t_addr addr, uint32 *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, int32 addr, UNIT *uptr, uint32 *val, int32 sw)
+int32 parse_sym (char *cptr, t_addr addr, UNIT *uptr, uint32 *val, int32 sw)
 {
 int32 cflag, i = 0, j, r;
 char gbuf[CBUFSIZE];
diff --git a/S3/s3_cpu.c b/S3/s3_cpu.c
index e3f06482..0457d192 100644
--- a/S3/s3_cpu.c
+++ b/S3/s3_cpu.c
@@ -397,8 +397,6 @@ extern int32 dsk1 (int32 op, int32 m, int32 n, int32 data);
 extern int32 dsk2 (int32 op, int32 m, int32 n, int32 data);
 extern int32 cpu (int32 op, int32 m, int32 n, int32 data);
 extern t_stat sim_activate (UNIT *uptr, int32 delay);
-extern int32 fprint_sym (FILE *of, int32 addr, uint32 *val,
-    UNIT *uptr, int32 sw);
 int32 nulldev (int32 opcode, int32 m, int32 n, int32 data);
 int32 add_zoned (int32 addr1, int32 len1, int32 addr2, int32 len2);
 int32 subtract_zoned (int32 addr1, int32 len1, int32 addr2, int32 len2);
diff --git a/S3/s3_sys.c b/S3/s3_sys.c
index bb9911c9..3adf7696 100644
--- a/S3/s3_sys.c
+++ b/S3/s3_sys.c
@@ -252,7 +252,7 @@ return (SCPE_OK);
         status  =       error code
 */
 
-int32 fprint_sym (FILE *of, int32 addr, uint32 *val,
+int32 fprint_sym (FILE *of, t_addr addr, uint32 *val,
     UNIT *uptr, int32 sw)
 {
     int32 r;
@@ -501,7 +501,7 @@ return -(oplen - 1);
         status  =       error status
 */
 
-int32 parse_sym (char *cptr, int32 addr, UNIT *uptr, uint32 *val, int32 sw)
+int32 parse_sym (char *cptr, t_addr addr, UNIT *uptr, uint32 *val, int32 sw)
 {
 int32 cflag, i = 0, j, r, oplen, addtyp, saveaddr, vptr;
 char gbuf[CBUFSIZE];
diff --git a/Visual Studio Projects/BuildAll.cmd b/Visual Studio Projects/BuildAll.cmd
index 0bf66a39..c64268e3 100644
--- a/Visual Studio Projects/BuildAll.cmd	
+++ b/Visual Studio Projects/BuildAll.cmd	
@@ -20,7 +20,7 @@ rem
 set BIN_REPO=Win32-Development-Binaries
 if exist "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat" call "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
 if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
-cd H:\Local\Projects\simh\simh-Extra-VAXen\Visual Studio Projects
+cd %~p0
 SET GIT_COMMIT_ID=
 if not exist ..\.git-commit-id goto _NoId
 for /F %%i in (..\.git-commit-id) do set GIT_COMMIT_ID=%%i
diff --git a/sim_defs.h b/sim_defs.h
index 04a0d7be..40b9f098 100644
--- a/sim_defs.h
+++ b/sim_defs.h
@@ -805,6 +805,8 @@ extern int32 sim_asynch_inst_latency;
 #define AIO_VALIDATE
 #define AIO_CHECK_EVENT
 #define AIO_INIT
+#define AIO_LOCK
+#define AIO_UNLOCK
 #define AIO_CLEANUP
 #define AIO_RETURN_TIME(uptr)
 #define AIO_IS_ACTIVE(uptr) FALSE
diff --git a/swtp6800/common/m6800.c b/swtp6800/common/m6800.c
index c78a5bbb..a1e1aae7 100644
--- a/swtp6800/common/m6800.c
+++ b/swtp6800/common/m6800.c
@@ -1955,7 +1955,7 @@ int32 sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
         for M6800
 */
 
-int32 fprint_sym (FILE *of, int32 addr, uint32 *val, UNIT *uptr, int32 sw)
+int32 fprint_sym (FILE *of, t_addr addr, uint32 *val, UNIT *uptr, int32 sw)
 {
     int32 i, inst, inst1;
 
@@ -2010,7 +2010,7 @@ int32 fprint_sym (FILE *of, int32 addr, uint32 *val, UNIT *uptr, int32 sw)
         status  =   error status
 */
 
-int32 parse_sym (char *cptr, int32 addr, UNIT *uptr, uint32 *val, int32 sw)
+int32 parse_sym (char *cptr, t_addr addr, UNIT *uptr, uint32 *val, int32 sw)
 {
     return (-2);
 }