diff --git a/TitanEngine/Global.Engine.Context.cpp b/TitanEngine/Global.Engine.Context.cpp
index 20e5161..ae4a898 100644
--- a/TitanEngine/Global.Engine.Context.cpp
+++ b/TitanEngine/Global.Engine.Context.cpp
@@ -214,7 +214,7 @@ bool _SetFullContextDataEx(HANDLE hActiveThread, TITAN_ENGINE_CONTEXT_t* titcont
     DBGContext.FloatSave.ErrorOffset = titcontext->x87fpu.ErrorOffset;
     DBGContext.FloatSave.DataSelector = titcontext->x87fpu.DataSelector;
     DBGContext.FloatSave.DataOffset = titcontext->x87fpu.DataOffset;
-    DBGContext.FloatSave.Cr0NpxState = titcontext->x87fpu.Cr0NpxState;
+    DBGContext.FloatSave.Spare0 = titcontext->x87fpu.Cr0NpxState;
 
     memcpy(DBGContext.FloatSave.RegisterArea, titcontext->RegisterArea, 80);
 
@@ -312,7 +312,7 @@ bool _GetFullContextDataEx(HANDLE hActiveThread, TITAN_ENGINE_CONTEXT_t* titcont
     titcontext->x87fpu.ErrorOffset = DBGContext.FloatSave.ErrorOffset;
     titcontext->x87fpu.DataSelector = DBGContext.FloatSave.DataSelector;
     titcontext->x87fpu.DataOffset = DBGContext.FloatSave.DataOffset;
-    titcontext->x87fpu.Cr0NpxState = DBGContext.FloatSave.Cr0NpxState;
+    titcontext->x87fpu.Cr0NpxState = DBGContext.FloatSave.Spare0;
 
     memcpy(titcontext->RegisterArea, DBGContext.FloatSave.RegisterArea, 80);
 
diff --git a/TitanEngine/TitanEngine.vcxproj b/TitanEngine/TitanEngine.vcxproj
index 851210d..1467501 100644
--- a/TitanEngine/TitanEngine.vcxproj
+++ b/TitanEngine/TitanEngine.vcxproj
@@ -28,21 +28,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -105,6 +109,7 @@
       </OmitFramePointers>
       <ExceptionHandling>Sync</ExceptionHandling>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(ProjectDir)ntdll_x86.lib;$(SolutionDir)$(Platform)\Release-Lib\scylla_wrapper_x86.lib;$(ProjectDir)distorm_x86.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -134,6 +139,7 @@
       <OmitFramePointers>
       </OmitFramePointers>
       <ExceptionHandling>Sync</ExceptionHandling>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(ProjectDir)ntdll_x86.lib;$(SolutionDir)$(Platform)\Release-Lib\scylla_wrapper_x86.lib;$(ProjectDir)distorm_x86.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -163,6 +169,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <ExceptionHandling>false</ExceptionHandling>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(ProjectDir)ntdll_x64.lib;$(SolutionDir)$(Platform)\Release-Lib\scylla_wrapper_x64.lib;$(ProjectDir)distorm_x64.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -201,6 +208,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
       <ExceptionHandling>false</ExceptionHandling>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(ProjectDir)ntdll_x64.lib;$(SolutionDir)$(Platform)\Release-Lib\scylla_wrapper_x64.lib;$(ProjectDir)distorm_x64.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -348,6 +356,11 @@
       <FileType>Document</FileType>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\scylla_wrapper_dll\scylla_wrapper\scylla_wrapper.vcxproj">
+      <Project>{f874b1b3-8ef7-4df1-9889-57098e08a51c}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/TitanEngine/aplib.h b/TitanEngine/aplib.h
index 5bbf3cf..b44a7a0 100644
--- a/TitanEngine/aplib.h
+++ b/TitanEngine/aplib.h
@@ -12,13 +12,7 @@
 #ifndef APLIB_H_INCLUDED
 #define APLIB_H_INCLUDED
 
-#ifdef _WIN64
-#pragma comment(lib,"aplib_x64.lib")
 #define APLIB_CONVENTION
-#else
-#pragma comment(lib,"aplib_x86.lib")
-#define APLIB_CONVENTION __cdecl
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,10 +37,13 @@ unsigned int APLIB_CONVENTION aP_depack_asm(const void* source, void* destinatio
 
 unsigned int APLIB_CONVENTION aP_depack_asm_fast(const void* source, void* destination);
 
-unsigned int APLIB_CONVENTION aP_depack_asm_safe(const void* source,
+inline unsigned int APLIB_CONVENTION aP_depack_asm_safe(const void* source,
         unsigned int srclen,
         void* destination,
-        unsigned int dstlen);
+    unsigned int dstlen)
+{
+    return 0;
+}
 
 unsigned int APLIB_CONVENTION aP_crc32(const void* source, unsigned int length);
 
@@ -61,10 +58,13 @@ unsigned int APLIB_CONVENTION aPsafe_check(const void* source);
 
 unsigned int APLIB_CONVENTION aPsafe_get_orig_size(const void* source);
 
-unsigned int APLIB_CONVENTION aPsafe_depack(const void* source,
-        unsigned int srclen,
-        void* destination,
-        unsigned int dstlen);
+inline unsigned int APLIB_CONVENTION aPsafe_depack(const void* source,
+    unsigned int srclen,
+    void* destination,
+    unsigned int dstlen)
+{
+    return 0;
+}
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/scylla_wrapper_dll b/scylla_wrapper_dll
index 4ad953e..bcfacd8 160000
--- a/scylla_wrapper_dll
+++ b/scylla_wrapper_dll
@@ -1 +1 @@
-Subproject commit 4ad953ec04108269f1d80a91b2723b3e22d1b4d2
+Subproject commit bcfacd85018a9457944e665c0570a2c32509e6ba