diff --git a/AltairZ80/altairz80_cpu.c b/AltairZ80/altairz80_cpu.c
index 7b4e7a5c..e645b7c3 100644
--- a/AltairZ80/altairz80_cpu.c
+++ b/AltairZ80/altairz80_cpu.c
@@ -1774,7 +1774,8 @@ void PutByteDMA(const uint32 Addr, const uint32 Value) {
 static int32 sim_brk_lookup (const t_addr loc, const int32 btyp) {
     extern t_bool sim_brk_pend[SIM_BKPT_N_SPC];
     extern t_addr sim_brk_ploc[SIM_BKPT_N_SPC];
-    extern char *sim_brk_act;
+    extern int32 sim_do_depth;
+    extern char *sim_brk_act[];
     BRKTAB *bp;
     if ((bp = sim_brk_fnd (loc)) &&                         /* entry in table?  */
         (btyp & bp -> typ) &&                               /* type match?      */
@@ -1782,7 +1783,7 @@ static int32 sim_brk_lookup (const t_addr loc, const int32 btyp) {
         (--(bp -> cnt) <= 0)) {                             /* count reach 0?   */
         bp -> cnt = 0;                                      /* reset count      */
         sim_brk_ploc[0] = loc;                              /* save location    */
-        sim_brk_act = bp -> act;                            /* set up actions   */
+        sim_brk_act[sim_do_depth] = bp -> act;              /* set up actions   */
         sim_brk_pend[0] = TRUE;                             /* don't do twice   */
         return TRUE;
     }
diff --git a/AltairZ80/altairz80_sio.c b/AltairZ80/altairz80_sio.c
index 94a35f81..fb76b774 100644
--- a/AltairZ80/altairz80_sio.c
+++ b/AltairZ80/altairz80_sio.c
@@ -132,7 +132,7 @@ static t_stat sio_attach(UNIT *uptr, char *cptr);
 static t_stat sio_detach(UNIT *uptr);
 static t_stat ptr_reset(DEVICE *dptr);
 static t_stat ptp_reset(DEVICE *dptr);
-static t_stat toBool(char tf, int *result);
+static t_stat toBool(char tf, int32 *result);
 static t_stat sio_dev_set_port(UNIT *uptr, int32 value, char *cptr, void *desc);
 static t_stat sio_dev_show_port(FILE *st, UNIT *uptr, int32 val, void *desc);
 static t_stat sio_dev_set_interrupton(UNIT *uptr, int32 value, char *cptr, void *desc);
@@ -859,7 +859,7 @@ int32 sio1d(const int32 port, const int32 io, const int32 data) {
     return result;
 }
 
-static t_stat toBool(char tf, int *result) {
+static t_stat toBool(char tf, int32 *result) {
     if (tf == 'T') {
         *result = TRUE;
         return SCPE_OK;
diff --git a/AltairZ80/i8272.c b/AltairZ80/i8272.c
index b02fa450..bf7451da 100644
--- a/AltairZ80/i8272.c
+++ b/AltairZ80/i8272.c
@@ -476,8 +476,8 @@ static char *messages[0x20] = {
 uint8 I8272_Write(const uint32 Addr, uint8 cData)
 {
     I8272_DRIVE_INFO    *pDrive;
-    unsigned int flags = 0;
-    unsigned int readlen;
+    uint32 flags = 0;
+    uint32 readlen;
     uint8   disk_read = 0;
     int32 i;
 
diff --git a/AltairZ80/mfdc.c b/AltairZ80/mfdc.c
index e697660d..7438039c 100644
--- a/AltairZ80/mfdc.c
+++ b/AltairZ80/mfdc.c
@@ -417,8 +417,8 @@ static uint8 MFDC_Read(const uint32 Addr)
             if(mfdc_info->datacount == 0) {
                 unsigned int i, checksum;
                 unsigned long sec_offset;
-                unsigned int flags;
-                unsigned int readlen;
+                uint32 flags;
+                uint32 readlen;
 
                 /* Clear out unused portion of sector. */
                 memset(&sdata.u.unused[0], 0x00, 10);
@@ -516,8 +516,8 @@ static uint8 MFDC_Read(const uint32 Addr)
 static uint8 MFDC_Write(const uint32 Addr, uint8 cData)
 {
     unsigned int sec_offset;
-    unsigned int flags = 0;
-    unsigned int writelen;
+    uint32 flags = 0;
+    uint32 writelen;
     MFDC_DRIVE_INFO *pDrive;
 
     pDrive = &mfdc_info->drive[mfdc_info->sel_drive];
diff --git a/AltairZ80/vfdhd.c b/AltairZ80/vfdhd.c
index bc03ed44..a8879cb0 100644
--- a/AltairZ80/vfdhd.c
+++ b/AltairZ80/vfdhd.c
@@ -534,7 +534,7 @@ static void VFDHD_Command(void)
 
     if(vfdhd_info->read == 1) { /* Perform a Read operation */
         unsigned int i, checksum;
-        unsigned int readlen;
+        uint32 readlen;
 
         sim_debug(RD_DATA_MSG, &vfdhd_dev, "VFDHD: " ADDRESS_FORMAT " RD: Drive=%d, Track=%d, Head=%d, Sector=%d\n", PCX, vfdhd_info->sel_drive, pDrive->track, vfdhd_info->head, vfdhd_info->sector);
 
@@ -601,7 +601,7 @@ static void VFDHD_Command(void)
         }
 
     } else {    /* Perform a Write operation */
-        unsigned int writelen;
+        uint32 writelen;
 
         sim_debug(WR_DATA_MSG, &vfdhd_dev, "VFDHD: " ADDRESS_FORMAT " WR: Drive=%d, Track=%d, Head=%d, Sector=%d\n", PCX, vfdhd_info->sel_drive, pDrive->track, vfdhd_info->head, vfdhd_info->sector);
 
diff --git a/AltairZ80/wd179x.c b/AltairZ80/wd179x.c
index 034d7e80..f3992603 100644
--- a/AltairZ80/wd179x.c
+++ b/AltairZ80/wd179x.c
@@ -444,8 +444,8 @@ uint8 WD179X_Read(const uint32 Addr)
 {
     uint8 cData;
     WD179X_DRIVE_INFO    *pDrive;
-    unsigned int flags = 0;
-    unsigned int readlen;
+    uint32 flags = 0;
+    uint32 readlen;
     int status;
 
     if(wd179x_info->sel_drive >= WD179X_MAX_DRIVES) {
@@ -571,8 +571,8 @@ static uint8 Do1793Command(uint8 cCommand)
 {
     uint8 result = 0;
     WD179X_DRIVE_INFO    *pDrive;
-    unsigned int flags = 0;
-    unsigned int readlen;
+    uint32 flags = 0;
+    uint32 readlen;
     int status;
 
     if(wd179x_info->sel_drive >= WD179X_MAX_DRIVES) {
@@ -952,8 +952,8 @@ uint8 WD179X_Write(const uint32 Addr, uint8 cData)
 {
     WD179X_DRIVE_INFO    *pDrive;
 /*    uint8   disk_read = 0; */
-    unsigned int flags = 0;
-    unsigned int writelen;
+    uint32 flags = 0;
+    uint32 writelen;
 
     if(wd179x_info->sel_drive >= WD179X_MAX_DRIVES) {
         return 0xFF;
diff --git a/PDP11/pdp11_rl.c b/PDP11/pdp11_rl.c
index 1e77512c..ef338bf5 100644
--- a/PDP11/pdp11_rl.c
+++ b/PDP11/pdp11_rl.c
@@ -253,14 +253,14 @@ t_stat rl_set_bad (UNIT *uptr, int32 val, char *cptr, void *desc);
 static void rlv_maint (void);
 t_stat rl_detach (UNIT *uptr);
 t_stat rl_set_cover (UNIT *, int32, char *, void *);
-t_stat rl_show_cover (FILE *, UNIT *, int, void *);
+t_stat rl_show_cover (FILE *, UNIT *, int32, void *);
 t_stat rl_set_load (UNIT *, int32, char *, void *);
-t_stat rl_show_load (FILE *, UNIT *, int, void *);
-t_stat rl_show_dstate (FILE *, UNIT *, int, void *);
+t_stat rl_show_load (FILE *, UNIT *, int32, void *);
+t_stat rl_show_dstate (FILE *, UNIT *, int32, void *);
 #if defined (VM_PDP11)
 t_stat rl_set_ctrl (UNIT *uptr, int32 val, char *cptr, void *desc);
 #endif
-t_stat rl_show_ctrl (FILE *st, UNIT *uptr, int val, void *desc);
+t_stat rl_show_ctrl (FILE *st, UNIT *uptr, int32 val, void *desc);
 
 /* RL11 data structures
 
@@ -1043,7 +1043,7 @@ t_stat rl_set_cover (UNIT *uptr, int32 val, char *cptr, void *desc)
     return (SCPE_OK);
 }
 
-t_stat rl_show_cover (FILE *st, UNIT *uptr, int val, void *desc)
+t_stat rl_show_cover (FILE *st, UNIT *uptr, int32 val, void *desc)
 {
     fprintf (st, "cover %s", (uptr->STAT & RLDS_CVO) ? "open" : "closed");
     return (SCPE_OK);
@@ -1072,14 +1072,14 @@ t_stat rl_set_load (UNIT *uptr, int32 val, char *cptr, void *desc)
     return (SCPE_OK);
 }
 
-t_stat rl_show_load (FILE *st, UNIT *uptr, int val, void *desc)
+t_stat rl_show_load (FILE *st, UNIT *uptr, int32 val, void *desc)
 {
     fprintf (st, "load %s",
         ((uptr->STAT & RLDS_M_STATE) != RLDS_LOAD) ? "set" : "reset");
     return (SCPE_OK);
 }
 
-t_stat rl_show_dstate (FILE *st, UNIT *uptr, int val, void *desc)
+t_stat rl_show_dstate (FILE *st, UNIT *uptr, int32 val, void *desc)
 {
     int32   cnt;
 
@@ -1121,7 +1121,7 @@ t_stat rl_set_ctrl (UNIT *uptr, int32 val, char *cptr, void *desc)
 #endif
 
 /* SHOW RL will display the controller type */
-t_stat rl_show_ctrl (FILE *st, UNIT *uptr, int val, void *desc)
+t_stat rl_show_ctrl (FILE *st, UNIT *uptr, int32 val, void *desc)
 {
     char    *s = "RLV12";
 	
diff --git a/PDP11/pdp11_rx.c b/PDP11/pdp11_rx.c
index 67335d22..f4267b61 100644
--- a/PDP11/pdp11_rx.c
+++ b/PDP11/pdp11_rx.c
@@ -130,7 +130,7 @@ t_stat rx_wr (int32 data, int32 PA, int32 access);
 t_stat rx_svc (UNIT *uptr);
 t_stat rx_reset (DEVICE *dptr);
 t_stat rx_boot (int32 unitno, DEVICE *dptr);
-void rx_done (int esr_flags, int new_ecode);
+void rx_done (int32 esr_flags, int32 new_ecode);
 
 /* RX11 data structures
 
diff --git a/PDP11/pdp11_ry.c b/PDP11/pdp11_ry.c
index 7310cf80..47b51975 100644
--- a/PDP11/pdp11_ry.c
+++ b/PDP11/pdp11_ry.c
@@ -161,7 +161,7 @@ t_stat ry_wr (int32 data, int32 PA, int32 access);
 t_stat ry_svc (UNIT *uptr);
 t_stat ry_reset (DEVICE *dptr);
 t_stat ry_boot (int32 unitno, DEVICE *dptr);
-void ry_done (int esr_flags, int new_ecode);
+void ry_done (int32 esr_flags, int32 new_ecode);
 t_stat ry_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
 t_stat ry_attach (UNIT *uptr, char *cptr);
 
diff --git a/Visual Studio Projects/PDP18B.vcproj b/Visual Studio Projects/PDP18B.vcproj
deleted file mode 100644
index 236714c9..00000000
--- a/Visual Studio Projects/PDP18B.vcproj	
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="PDP18B"
-	ProjectGUID="{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}"
-	RootNamespace="PDP18B"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
-			IntermediateDirectory="..\BIN\NT\Project\simh\PDP18B\$(PlatformName)-$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../;../PDP18B/"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\PDP18B.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\PDP18B.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
-			IntermediateDirectory="..\BIN\NT\Project\simh\PDP18B\$(PlatformName)-$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../;../PDP18B/"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\PDP18B.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\PDP18B\pdp18b_cpu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_drm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_dt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_fpp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_lp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_mt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_rb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_rf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_rp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_stddev.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_sys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_tt1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\scp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_console.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_ether.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_fio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_sock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_tape.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_timer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_tmxr.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
-			>
-			<File
-				RelativePath="..\PDP18B\pdp18b_defs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\scp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_console.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_defs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_ether.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_fio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_rev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_sock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_tape.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sim_tmxr.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/Visual Studio Projects/Simh.sln b/Visual Studio Projects/Simh.sln
index c855bee0..9eb34c1c 100644
--- a/Visual Studio Projects/Simh.sln	
+++ b/Visual Studio Projects/Simh.sln	
@@ -43,8 +43,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "I1620", "I1620.vcproj", "{0
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IBM1130", "IBM1130.vcproj", "{D593C954-5115-4D15-ABDB-01B66006FF6F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDP18B", "PDP18B.vcproj", "{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDP15", "PDP15.vcproj", "{44C07AA4-6D56-45ED-8393-18A23E76B758}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDP9", "PDP9.vcproj", "{9D589BCA-9E10-4FFA-B43F-DDFA91C1C098}"
@@ -143,10 +141,6 @@ Global
 		{D593C954-5115-4D15-ABDB-01B66006FF6F}.Debug|Win32.Build.0 = Debug|Win32
 		{D593C954-5115-4D15-ABDB-01B66006FF6F}.Release|Win32.ActiveCfg = Release|Win32
 		{D593C954-5115-4D15-ABDB-01B66006FF6F}.Release|Win32.Build.0 = Release|Win32
-		{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}.Debug|Win32.Build.0 = Debug|Win32
-		{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}.Release|Win32.ActiveCfg = Release|Win32
-		{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}.Release|Win32.Build.0 = Release|Win32
 		{44C07AA4-6D56-45ED-8393-18A23E76B758}.Debug|Win32.ActiveCfg = Debug|Win32
 		{44C07AA4-6D56-45ED-8393-18A23E76B758}.Debug|Win32.Build.0 = Debug|Win32
 		{44C07AA4-6D56-45ED-8393-18A23E76B758}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/descrip.mms b/descrip.mms
index 27407ab5..7fd0c78a 100644
--- a/descrip.mms
+++ b/descrip.mms
@@ -250,7 +250,7 @@ ALTAIRZ80_SOURCE1 = $(ALTAIRZ80_DIR)ALTAIRZ80_CPU.C,$(ALTAIRZ80_DIR)ALTAIRZ80_CP
                     $(ALTAIRZ80_DIR)ALTAIRZ80_HDSK.C,$(ALTAIRZ80_DIR)ALTAIRZ80_NET.C,\
                     $(ALTAIRZ80_DIR)FLASHWRITER2.C,$(ALTAIRZ80_DIR)I86_DECODE.C,\
                     $(ALTAIRZ80_DIR)I86_OPS.C,$(ALTAIRZ80_DIR)I86_PRIM_OPS.C,\
-                    $(ALTAIRZ80_DIR)I8272.C,$(ALTAIRZ80_DIR)INSNSA.C,$(ALTAIRZ80_DIR)INSNSD.C,\
+                    $(ALTAIRZ80_DIR)I8272.C,$(ALTAIRZ80_DIR)INSNSD.C,\
                     $(ALTAIRZ80_DIR)MFDC.C,$(ALTAIRZ80_DIR)N8VEM.C,$(ALTAIRZ80_DIR)VFDHD.C
 ALTAIRZ80_LIB2 = $(LIB_DIR)ALTAIRZ80L2-$(ARCH).OLB
 ALTAIRZ80_SOURCE2 = $(ALTAIRZ80_DIR)S100_DISK1A.C,$(ALTAIRZ80_DIR)S100_DISK2.C,\
@@ -488,8 +488,7 @@ PDP10_SOURCE = $(PDP10_DIR)PDP10_FE.C,\
                $(PDP10_DIR)PDP10_RP.C,$(PDP10_DIR)PDP10_SYS.C,\
                $(PDP10_DIR)PDP10_TIM.C,$(PDP10_DIR)PDP10_TU.C,\
                $(PDP11_DIR)PDP11_PT.C,$(PDP11_DIR)PDP11_DZ.C,\
-               $(PDP11_DIR)PDP11_RY.C,$(PDP11_DIR)PDP11_XU.C,\
-               $(PDP11_DIR)PDP11_CR.C
+               $(PDP11_DIR)PDP11_RY.C,$(PDP11_DIR)PDP11_CR.C
 PDP10_OPTIONS = /INCL=($(SIMH_DIR),$(PDP10_DIR),$(PDP11_DIR))\
                 /DEF=($(CC_DEFS),"USE_INT64=1","VM_PDP10=1"$(PCAP_DEFS))
 
diff --git a/scp.c b/scp.c
index 59344e72..eac6523a 100644
--- a/scp.c
+++ b/scp.c
@@ -438,7 +438,7 @@ FILE *sim_deb = NULL;                                   /* debug file */
 FILEREF *sim_deb_ref = NULL;                            /* debug file file reference */
 static FILE *sim_gotofile;                              /* the currently open do file */
 static int32 sim_do_echo = 0;                           /* the echo status of the currently open do file */
-static int32 sim_do_depth = 0;
+int32 sim_do_depth = 0;
 
 static int32 sim_on_check[MAX_DO_NEST_LVL+1];
 static char *sim_on_actions[MAX_DO_NEST_LVL+1][SCPE_MAX_ERR+1];
@@ -4599,8 +4599,7 @@ return pptr;
 
 SCHTAB *get_search (char *cptr, int32 radix, SCHTAB *schptr)
 {
-int32 c;
-size_t logop, cmpop;
+int32 c, logop, cmpop;
 t_value logval, cmpval;
 char *sptr, *tptr;
 const char logstr[] = "|&^", cmpstr[] = "=!><";
@@ -4610,14 +4609,14 @@ if (*cptr == 0)                                         /* check for clause */
     return NULL;
 for (logop = cmpop = -1; c = *cptr++; ) {               /* loop thru clauses */
     if (sptr = strchr (logstr, c)) {                    /* check for mask */
-        logop = sptr - logstr;
+        logop = (int32)(sptr - logstr);
         logval = strtotv (cptr, &tptr, radix);
         if (cptr == tptr)
             return NULL;
         cptr = tptr;
         }
     else if (sptr = strchr (cmpstr, c)) {               /* check for boolop */
-        cmpop = sptr - cmpstr;
+        cmpop = (int32)(sptr - cmpstr);
         if (*cptr == '=') {
             cmpop = cmpop + strlen (cmpstr);
             cptr++;
@@ -4630,11 +4629,11 @@ for (logop = cmpop = -1; c = *cptr++; ) {               /* loop thru clauses */
     else return NULL;
     }                                                   /* end for */
 if (logop >= 0) {
-    schptr->logic = (int32)logop;
+    schptr->logic = logop;
     schptr->mask = logval;
     }
 if (cmpop >= 0) {
-    schptr->boolop = (int32)cmpop;
+    schptr->boolop = cmpop;
     schptr->comp = cmpval;
     }
 return schptr;