diff --git a/.gitignore b/.gitignore
index 0881b8d..d969d5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -149,3 +149,8 @@ $RECYCLE.BIN/
 
 # Mac crap
 .DS_Store
+
+*.cscope_file_list
+*.bmarks
+*.depend
+*.layout
diff --git a/TitanEngine/TitanEngine.cpp b/TitanEngine/TitanEngine.cpp
index d0a3fb2..c7e649a 100644
--- a/TitanEngine/TitanEngine.cpp
+++ b/TitanEngine/TitanEngine.cpp
@@ -19416,7 +19416,7 @@ __declspec(dllexport) void TITCALL ImporterAutoSearchIAT(DWORD ProcessId, char*
 __declspec(dllexport) void TITCALL ImporterAutoSearchIATW(DWORD ProcessId, wchar_t* szFileName, ULONG_PTR SearchStart, LPVOID pIATStart, LPVOID pIATSize)
 { 
     ULONG_PTR iatStart = NULL;
-    ULONG_PTR iatSize = NULL;
+    DWORD iatSize = NULL;
 
     scylla_searchIAT(ProcessId, iatStart, iatSize, SearchStart, false);
     
@@ -19554,7 +19554,7 @@ __declspec(dllexport) long TITCALL ImporterAutoFixIATExW(DWORD ProcessId, wchar_
     HANDLE FileMap;
     ULONG_PTR FileMapVA;
     ULONG_PTR iatStart = NULL;
-    ULONG_PTR iatSize = NULL;
+    DWORD iatSize = NULL;
     TCHAR IatFixFileName[MAX_PATH];
     TCHAR DumpFileName[MAX_PATH];
 
@@ -27542,9 +27542,9 @@ __declspec(dllexport) bool TITCALL ExtensionManagerUnloadPlugin(char* szPluginNa
     }
     return(false);
 }
+
 __declspec(dllexport) void* TITCALL ExtensionManagerGetPluginInfo(char* szPluginName)
 {
-
     for(unsigned int i = 0; i < Plugin.size(); i++)
     {
         if(lstrcmpiA(Plugin[i].PluginName, szPluginName) == NULL)
@@ -27554,6 +27554,7 @@ __declspec(dllexport) void* TITCALL ExtensionManagerGetPluginInfo(char* szPlugin
     }
     return(NULL);
 }
+
 // Global.Garbage.functions:
 bool CreateGarbageItem(void* outGargabeItem, int MaxGargabeStringSize)
 {
diff --git a/TitanEngine/TitanEngine.vcxproj b/TitanEngine/TitanEngine.vcxproj
index 59b73ac..95c3581 100644
--- a/TitanEngine/TitanEngine.vcxproj
+++ b/TitanEngine/TitanEngine.vcxproj
@@ -129,15 +129,17 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;UNPACKERENGINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <StructMemberAlignment>1Byte</StructMemberAlignment>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsCpp</CompileAs>
+      <ExceptionHandling>false</ExceptionHandling>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(ProjectDir)distorm_x64.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(ProjectDir)scylla_wrapperd_x64.lib;$(ProjectDir)distorm_x64.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)TitanEngine.dll</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <ModuleDefinitionFile>$(ProjectDir)TitanEngine.def</ModuleDefinitionFile>
@@ -193,7 +195,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(ProjectDir)distorm_x64.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(ProjectDir)scylla_wrapper_x64.lib;$(ProjectDir)distorm_x64.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)TitanEngine.dll</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <ModuleDefinitionFile>$(ProjectDir)TitanEngine.def</ModuleDefinitionFile>
diff --git a/TitanEngine/distorm_x64.lib b/TitanEngine/distorm_x64.lib
index b3581f4..4dc1430 100644
Binary files a/TitanEngine/distorm_x64.lib and b/TitanEngine/distorm_x64.lib differ
diff --git a/TitanEngine/scylla_wrapper_x64.lib b/TitanEngine/scylla_wrapper_x64.lib
new file mode 100644
index 0000000..6ef2a71
Binary files /dev/null and b/TitanEngine/scylla_wrapper_x64.lib differ
diff --git a/TitanEngine/scylla_wrapper_x86.lib b/TitanEngine/scylla_wrapper_x86.lib
index 2be5f87..1183fd7 100644
Binary files a/TitanEngine/scylla_wrapper_x86.lib and b/TitanEngine/scylla_wrapper_x86.lib differ
diff --git a/TitanEngine/scylla_wrapperd_x64.lib b/TitanEngine/scylla_wrapperd_x64.lib
new file mode 100644
index 0000000..92e394a
Binary files /dev/null and b/TitanEngine/scylla_wrapperd_x64.lib differ
diff --git a/TitanEngine/scylla_wrapperd_x86.lib b/TitanEngine/scylla_wrapperd_x86.lib
index eb1f4c4..ae0ec8b 100644
Binary files a/TitanEngine/scylla_wrapperd_x86.lib and b/TitanEngine/scylla_wrapperd_x86.lib differ