diff --git a/CscdSvc/CscdSvc.vcxproj b/CscdSvc/CscdSvc.vcxproj
index 71ef48f..cbdbb87 100644
--- a/CscdSvc/CscdSvc.vcxproj
+++ b/CscdSvc/CscdSvc.vcxproj
@@ -100,7 +100,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <AdditionalLibraryDirectories>$(SolutionDir)lib\x86\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -120,7 +121,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <AdditionalLibraryDirectories>$(SolutionDir)lib\x86\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -136,7 +138,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <AdditionalLibraryDirectories>$(SolutionDir)lib\x64\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -156,7 +159,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <AdditionalLibraryDirectories>$(SolutionDir)lib\x64\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/CscdSvc/hook.c b/CscdSvc/hook.c
index 1dd5b03..a4b1a30 100644
--- a/CscdSvc/hook.c
+++ b/CscdSvc/hook.c
@@ -46,7 +46,7 @@ __declspec(dllexport) BOOL CALLBACK InstallUserHook()
 
 	// Unregister before we do anything
 	// TODO: kill uxtheme kill uxtheme
-	UnregisterUserApiHook();
+	UnregisterUserApiHookDelay();
 
 	// Get the module
 	g_hModule = GetModuleHandle(NULL);
diff --git a/CscdSvc/resource.rc b/CscdSvc/resource.rc
index 1fff371..6d46bdb 100644
--- a/CscdSvc/resource.rc
+++ b/CscdSvc/resource.rc
@@ -35,7 +35,7 @@ IDB_MENU BITMAP images\menu.bmp
 #define VER_INTERNALNAME_STR        "CscdSvc\0"
 #define VER_ORIGINALFILENAME_STR    "CSCDSVC.EXE"
 #define VER_PRODUCTNAME_STR         "Cascades Service Executable for Windows NT"
-#include "..\CscdCom\version.inc"
+#include "..\\CscdCom\\version.inc"
 #undef APSTUDIO_HIDDEN_SYMBOLS
 
 VS_VERSION_INFO VERSIONINFO