diff --git a/modules/std/fiber/fcontext.monkey2 b/modules/std/fiber/fcontext.monkey2
index 33d19756e..5e84742b8 100644
--- a/modules/std/fiber/fcontext.monkey2
+++ b/modules/std/fiber/fcontext.monkey2
@@ -10,9 +10,15 @@ Namespace std.fiber
 
 #If __TARGET__="windows"
 
-	#import "native/asm/make_i386_ms_pe_gas.asm"
-	#import "native/asm/jump_i386_ms_pe_gas.asm"
-	#import "native/asm/ontop_i386_ms_pe_gas.asm"
+	#if __ARCH__="x86"
+		#import "native/asm/make_i386_ms_pe_gas.asm"
+		#import "native/asm/jump_i386_ms_pe_gas.asm"
+		#import "native/asm/ontop_i386_ms_pe_gas.asm"
+	#elseif __ARCH__="x64"
+		#import "native/asm/make_x86_64_ms_pe_gas.asm"
+		#import "native/asm/jump_x86_64_ms_pe_gas.asm"
+		#import "native/asm/ontop_x86_64_ms_pe_gas.asm"
+	#endif
 
 #Else If __TARGET__="macos"
 
diff --git a/src/mx2cc/mx2cc.monkey2 b/src/mx2cc/mx2cc.monkey2
index e2db67f2c..b4236f06e 100644
--- a/src/mx2cc/mx2cc.monkey2
+++ b/src/mx2cc/mx2cc.monkey2
@@ -516,7 +516,7 @@ Function ParseOpts:String[]( opts:BuildOpts,args:String[] )
 		Endif
 	
 		If opts.arch="x64" And opts.toolchain<>"msvc"
-			Fail( "x64 builds for windows currently only supported for msvc" )
+			'Fail( "x64 builds for windows currently only supported for msvc" )
 		Endif
 		
 	Case "macos","linux"