diff --git a/.github/workflows/vsbuild_xp.yml b/.github/workflows/vsbuild_xp.yml
index 390fe605945..db2a8d60c63 100644
--- a/.github/workflows/vsbuild_xp.yml
+++ b/.github/workflows/vsbuild_xp.yml
@@ -12,7 +12,7 @@ jobs:
       actions: write  # for styfle/cancel-workflow-action to cancel/stop running workflows
       contents: write # for actions/checkout to fetch code and softprops/action-gh-release
     if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
-    runs-on: windows-latest
+    runs-on: windows-2019
     defaults:
       run:
         shell: pwsh
diff --git a/src/dos/dos_classes.cpp b/src/dos/dos_classes.cpp
index b74b032cbfd..0317f6c6a76 100644
--- a/src/dos/dos_classes.cpp
+++ b/src/dos/dos_classes.cpp
@@ -126,7 +126,7 @@ void DOS_InfoBlock::SetLocation(uint16_t segment) {
 	sSave(sDIB,nulString[6],(uint8_t)0x20);
 	sSave(sDIB,nulString[7],(uint8_t)0x20);
 
-#if 0
+#if 1 // FIXME: The new code imported from DOSBox Staging is causing Windows 3.1 to crash on exit, so this old code remains active until that can be fixed
     /* Create a fake SFT, so programs think there are 100 file handles */
 	uint16_t sftOffset=offsetof(sDIB,firstFileTable)+0xa2;
 	sSave(sDIB,firstFileTable,RealMake(segment,sftOffset));
@@ -134,7 +134,7 @@ void DOS_InfoBlock::SetLocation(uint16_t segment) {
 	real_writew(segment,sftOffset+0x04,DOS_FILES/2);	//File Table supports DOS_FILES/2 files
 	real_writed(segment+0x26,0x00,0xffffffff);		//Last File Table
 	real_writew(segment+0x26,0x04,DOS_FILES-DOS_FILES/2);	//File Table supports DOS_FILES/2 files
-#endif
+#else
     /* Imported from dosbox-staging/dosbox-staging#3680 */
     constexpr int FakeHandles = 100;
 
@@ -162,6 +162,7 @@ void DOS_InfoBlock::SetLocation(uint16_t segment) {
 
     real_writed(second_sft_segment, NextTableOffset, EndPointer);
     real_writew(second_sft_segment, NumberOfFilesOffset, FakeHandles);
+#endif
 }
 
 void DOS_InfoBlock::SetFirstMCB(uint16_t _firstmcb) {
diff --git a/vs/sdl/src/video/quartz/SDL_QuartzVideo.m b/vs/sdl/src/video/quartz/SDL_QuartzVideo.m
index f033184f3ce..41b50219b4a 100644
--- a/vs/sdl/src/video/quartz/SDL_QuartzVideo.m
+++ b/vs/sdl/src/video/quartz/SDL_QuartzVideo.m
@@ -112,7 +112,7 @@ - (void)drawRect:(NSRect)dirtyRect
     [super drawRect:dirtyRect];
     CGSize size = [_text size];
     [[NSColor whiteColor] set];
-    NSRectFill(dirtyRect);
+    NSRectFill(self.bounds);
     [_text drawInRect:CGRectMake(0, 0, size.width, size.height)];
 }
 @end
diff --git a/vs/sdl2/src/video/cocoa/SDL_cocoakeyboard.m b/vs/sdl2/src/video/cocoa/SDL_cocoakeyboard.m
index a95c9e253c4..616800d5cc5 100644
--- a/vs/sdl2/src/video/cocoa/SDL_cocoakeyboard.m
+++ b/vs/sdl2/src/video/cocoa/SDL_cocoakeyboard.m
@@ -45,7 +45,7 @@ - (void)drawRect:(NSRect)dirtyRect
     [super drawRect:dirtyRect];
     size = [_text size];
     [[NSColor whiteColor] set];
-    NSRectFill(dirtyRect);
+    NSRectFill(self.bounds);
     [_text drawInRect:CGRectMake(0, 0, size.width, size.height)];
 }
 @end