diff --git a/sourcehook/generate/sourcehook.hxx b/sourcehook/generate/sourcehook.hxx
index 1fb2aed..da74d6a 100755
--- a/sourcehook/generate/sourcehook.hxx
+++ b/sourcehook/generate/sourcehook.hxx
@@ -501,12 +501,12 @@ namespace SourceHook
 	{
 		inline static T* GetOrigRet(ISourceHook *shptr)
 		{
-			T &ref = *reinterpret_cast<const ReferenceCarrier<T&>::type *>(shptr->GetOrigRet());
+			T &ref = *reinterpret_cast<const typename ReferenceCarrier<T&>::type *>(shptr->GetOrigRet());
 			return &ref;
 		}
 		inline static T* GetOverrideRet(ISourceHook *shptr)
 		{
-			T &ref = *reinterpret_cast<const ReferenceCarrier<T&>::type *>(shptr->GetOverrideRet());
+			T &ref = *reinterpret_cast<const typename ReferenceCarrier<T&>::type *>(shptr->GetOverrideRet());
 			return &ref;
 		}
 	};
@@ -1348,7 +1348,7 @@ namespace SourceHook
 		void operator()(ISourceHook *shptr, T &res)
 		{
 			// overrideretptr points to ReferenceCarrier<T&>
-			*reinterpret_cast<ReferenceCarrier<T&>::type *>(shptr->GetOverrideRetPtr()) = res;
+			*reinterpret_cast<typename ReferenceCarrier<T&>::type *>(shptr->GetOverrideRetPtr()) = res;
 		}
 	};
 @[$1,0,$a:
diff --git a/sourcehook/test/msvc8/test.vcproj b/sourcehook/test/msvc8/test.vcproj
index 1e1260c..ae768e5 100644
--- a/sourcehook/test/msvc8/test.vcproj
+++ b/sourcehook/test/msvc8/test.vcproj
@@ -428,7 +428,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\testrefret.cpp"
+				RelativePath="..\testrefret.cpp"
 				>
 			</File>
 		</Filter>
@@ -495,7 +495,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="echo on&#x0D;&#x0A;pushd ..\..\generate&#x0D;&#x0A;shworker.exe iter sourcehook.hxx sourcehook.h 16&#x0D;&#x0A;copy sourcehook.h ..\sourcehook.h&#x0D;&#x0A;popd&#x0D;&#x0A;"
+							CommandLine="echo on&#x0D;&#x0A;pushd ..\..\generate&#x0D;&#x0A;shworker.exe iter sourcehook.hxx sourcehook.h 20&#x0D;&#x0A;copy sourcehook.h ..\sourcehook.h&#x0D;&#x0A;popd&#x0D;&#x0A;"
 							Outputs="..\..\sourcehook.h"
 						/>
 					</FileConfiguration>
diff --git a/sourcehook/test/msvc8/testrefret.cpp b/sourcehook/test/testrefret.cpp
similarity index 100%
rename from sourcehook/test/msvc8/testrefret.cpp
rename to sourcehook/test/testrefret.cpp