diff --git a/ConsoleToGo/ConsoleToGo.def b/ConsoleToGo/ConsoleToGo.def
index 773864e..94ee454 100755
--- a/ConsoleToGo/ConsoleToGo.def
+++ b/ConsoleToGo/ConsoleToGo.def
@@ -83,6 +83,7 @@ uncompress
 	strpbrk
 	ungetc
 	wcscspn
+	wcsncpy_s
 
 ; VMLibrary
 
diff --git a/ConsoleToGo/ConsoleToGo.vcxproj b/ConsoleToGo/ConsoleToGo.vcxproj
index 44061a6..3e6e622 100644
--- a/ConsoleToGo/ConsoleToGo.vcxproj
+++ b/ConsoleToGo/ConsoleToGo.vcxproj
@@ -158,11 +158,9 @@
   <ItemGroup>
     <None Include="..\Interprt.inl" />
     <None Include="..\InterprtPrim.inl" />
-    <None Include="..\InterprtPriv.inl" />
     <None Include="..\InterprtProc.inl" />
     <None Include="..\istasm.inc" />
     <None Include="..\ObjMemPriv.inl" />
-    <None Include="..\ote.inl" />
     <None Include="ConsoleToGo.def" />
     <None Include="data1.bin" />
   </ItemGroup>
@@ -179,7 +177,6 @@
     <ClInclude Include="..\oopq.h" />
     <ClInclude Include="..\ote.h" />
     <ClInclude Include="..\RaiseThreadException.h" />
-    <ClInclude Include="..\regkey.h" />
     <ClInclude Include="..\STExternal.h" />
     <ClInclude Include="..\STFloat.h" />
     <ClInclude Include="..\STHashedCollection.h" />
diff --git a/ExternalCall.asm b/ExternalCall.asm
index 6fc93a7..5e96522 100644
--- a/ExternalCall.asm
+++ b/ExternalCall.asm
@@ -1118,8 +1118,7 @@ ExtCallArgLPSTR:
 
 @@:
 	mov		ecx, ARG
-	mov		edx, CP_ACP									; Assume its an ANSI API (which is generally true of byte string APIs on Windows, unfortunately)
-	call	NewStringFromUtf16
+	call	NewStringFromUtf16							; Assume its an ANSI API and will not understand Utf8 (which is generally true of byte string APIs on Windows, unfortunately)
 	ASSUME	ARG:PTR OTE
 
 	mov		[_SP+OOPSIZE], eax
diff --git a/InProcToGo/IPToGo.def b/InProcToGo/IPToGo.def
index b62676d..f227a9a 100755
--- a/InProcToGo/IPToGo.def
+++ b/InProcToGo/IPToGo.def
@@ -94,6 +94,7 @@ uncompress
 	strpbrk
 	ungetc
 	wcscspn
+	wcsncpy_s
 
 ; VMLibrary
 
diff --git a/InProcToGo/InProcToGo.vcxproj b/InProcToGo/InProcToGo.vcxproj
index 6794cd8..806a14e 100644
--- a/InProcToGo/InProcToGo.vcxproj
+++ b/InProcToGo/InProcToGo.vcxproj
@@ -188,7 +188,6 @@
     <None Include="..\InterprtPrim.inl" />
     <None Include="..\InterprtProc.inl" />
     <None Include="..\ObjMemPriv.inl" />
-    <None Include="..\ote.inl" />
     <None Include="..\Res\hsplit.cur" />
     <None Include="..\Res\vsplit.cur" />
     <None Include="IPToGo.def" />
@@ -244,7 +243,6 @@
     <ClInclude Include="..\TraceStream.h" />
     <ClInclude Include="..\VMExcept.h" />
     <ClInclude Include="..\VMPointers.h" />
-    <ClInclude Include="..\WINHEAP.H" />
     <ClInclude Include="..\zlib\deflate.h" />
     <ClInclude Include="..\zlib\infblock.h" />
     <ClInclude Include="..\zlib\infcodes.h" />
diff --git a/ToGoStub/GuiToGo.vcxproj b/ToGoStub/GuiToGo.vcxproj
index 02ee632..b68ccc1 100644
--- a/ToGoStub/GuiToGo.vcxproj
+++ b/ToGoStub/GuiToGo.vcxproj
@@ -206,7 +206,6 @@
     <ClInclude Include="..\RaiseThreadException.h" />
     <ClInclude Include="..\regkey.h" />
     <ClInclude Include="..\segdefs.h" />
-    <ClInclude Include="..\STArray.h" />
     <ClInclude Include="..\startvm.h" />
     <ClInclude Include="..\StdAfx.h" />
     <ClInclude Include="..\STExternal.h" />
@@ -229,7 +228,6 @@
     <ClInclude Include="..\TraceStream.h" />
     <ClInclude Include="..\VMExcept.h" />
     <ClInclude Include="..\VMPointers.h" />
-    <ClInclude Include="..\WINHEAP.H" />
     <ClInclude Include="..\zlib\deflate.h" />
     <ClInclude Include="..\zlib\infblock.h" />
     <ClInclude Include="..\zlib\infcodes.h" />
diff --git a/ToGoStub/togo.def b/ToGoStub/togo.def
index 07f2a12..62a8de7 100755
--- a/ToGoStub/togo.def
+++ b/ToGoStub/togo.def
@@ -90,6 +90,7 @@ uncompress
 	strpbrk
 	ungetc
 	wcscspn
+	wcsncpy_s
 
 ; VMLibrary