diff --git a/src/Library.vcproj b/src/Library.vcproj
index 96053d9..5990bfa 100755
--- a/src/Library.vcproj
+++ b/src/Library.vcproj
@@ -123,6 +123,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				OutputFile="../lib/loki.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/test/DeletableSingleton/DeletableSingleton.cpp b/test/DeletableSingleton/DeletableSingleton.cpp
index 5918aa6..9a7a34e 100755
--- a/test/DeletableSingleton/DeletableSingleton.cpp
+++ b/test/DeletableSingleton/DeletableSingleton.cpp
@@ -60,7 +60,7 @@ public:
 };
 
 
-int main(int argc, char *argv[])
+int main()
 {
     // Instantiate both singletons by calling them...
     LogBook::Instance().print("LogClass singleton instantiated");
diff --git a/test/DeletableSingleton/DeletableSingleton.vcproj b/test/DeletableSingleton/DeletableSingleton.vcproj
index f89520d..8c5fb6d 100644
--- a/test/DeletableSingleton/DeletableSingleton.vcproj
+++ b/test/DeletableSingleton/DeletableSingleton.vcproj
@@ -102,6 +102,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\include"
+				RuntimeLibrary="2"
 				WarningLevel="4"
 			/>
 			<Tool
diff --git a/test/Factory/Factory.vcproj b/test/Factory/Factory.vcproj
index 86a5013..2314417 100755
--- a/test/Factory/Factory.vcproj
+++ b/test/Factory/Factory.vcproj
@@ -116,6 +116,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
diff --git a/test/LockingPtr/LockingPtr.vcproj b/test/LockingPtr/LockingPtr.vcproj
index 336f75f..537eda0 100755
--- a/test/LockingPtr/LockingPtr.vcproj
+++ b/test/LockingPtr/LockingPtr.vcproj
@@ -118,6 +118,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
@@ -133,6 +134,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\lib\loki.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
diff --git a/test/Longevity/Longevity.vcproj b/test/Longevity/Longevity.vcproj
index cceb293..e1ab441 100755
--- a/test/Longevity/Longevity.vcproj
+++ b/test/Longevity/Longevity.vcproj
@@ -116,6 +116,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
diff --git a/test/OrderedStatic/OrderedStatic.vcproj b/test/OrderedStatic/OrderedStatic.vcproj
index 8d6189f..940695c 100755
--- a/test/OrderedStatic/OrderedStatic.vcproj
+++ b/test/OrderedStatic/OrderedStatic.vcproj
@@ -116,6 +116,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
diff --git a/test/Pimpl/Pimpl.vcproj b/test/Pimpl/Pimpl.vcproj
index ff9a333..ce4235f 100755
--- a/test/Pimpl/Pimpl.vcproj
+++ b/test/Pimpl/Pimpl.vcproj
@@ -118,6 +118,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
@@ -133,6 +134,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\lib\loki.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
diff --git a/test/RegressionTest/MSVCUnitTest.vcproj b/test/RegressionTest/MSVCUnitTest.vcproj
index 1e824b0..7c00656 100755
--- a/test/RegressionTest/MSVCUnitTest.vcproj
+++ b/test/RegressionTest/MSVCUnitTest.vcproj
@@ -128,7 +128,7 @@
 				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/test/SafeFormat/SafeFormat.vcproj b/test/SafeFormat/SafeFormat.vcproj
index 1675b38..b34108b 100755
--- a/test/SafeFormat/SafeFormat.vcproj
+++ b/test/SafeFormat/SafeFormat.vcproj
@@ -116,6 +116,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
diff --git a/test/ScopeGuard/ScopeGuard.vcproj b/test/ScopeGuard/ScopeGuard.vcproj
index 8895022..118454c 100755
--- a/test/ScopeGuard/ScopeGuard.vcproj
+++ b/test/ScopeGuard/ScopeGuard.vcproj
@@ -116,6 +116,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
diff --git a/test/Singleton/Singleton.vcproj b/test/Singleton/Singleton.vcproj
index 350c86c..405d7d9 100755
--- a/test/Singleton/Singleton.vcproj
+++ b/test/Singleton/Singleton.vcproj
@@ -116,6 +116,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
@@ -168,10 +169,10 @@
 	</References>
 	<Files>
 		<File
-			RelativePath=".\DeletableSingleton.cpp"
+			RelativePath=".\Dependencies.cpp"
 			>
 			<FileConfiguration
-				Name="Debug|Win32"
+				Name="Release|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -179,10 +180,6 @@
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath=".\Dependencies.cpp"
-			>
-		</File>
 		<File
 			RelativePath=".\Phoenix.cpp"
 			>
diff --git a/test/SmallObj/DefaultAlloc.vcproj b/test/SmallObj/DefaultAlloc.vcproj
index 07b2c32..735ad79 100644
--- a/test/SmallObj/DefaultAlloc.vcproj
+++ b/test/SmallObj/DefaultAlloc.vcproj
@@ -122,7 +122,7 @@
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
diff --git a/test/SmallObj/SmallObjCompare.vcproj b/test/SmallObj/SmallObjCompare.vcproj
index 6d33b1a..0799889 100755
--- a/test/SmallObj/SmallObjCompare.vcproj
+++ b/test/SmallObj/SmallObjCompare.vcproj
@@ -125,7 +125,7 @@
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
diff --git a/test/SmallObj/SmallObjSingleton.vcproj b/test/SmallObj/SmallObjSingleton.vcproj
index e0f4996..36061a8 100755
--- a/test/SmallObj/SmallObjSingleton.vcproj
+++ b/test/SmallObj/SmallObjSingleton.vcproj
@@ -123,7 +123,7 @@
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
diff --git a/test/SmartPtr/SmartPtr.vcproj b/test/SmartPtr/SmartPtr.vcproj
index dadb3b0..15368d0 100644
--- a/test/SmartPtr/SmartPtr.vcproj
+++ b/test/SmartPtr/SmartPtr.vcproj
@@ -104,7 +104,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="C:\Projects\loki\include"
+				AdditionalIncludeDirectories="..\..\include"
+				RuntimeLibrary="2"
 				WarningLevel="4"
 			/>
 			<Tool
diff --git a/test/Visitor/Visitor.vcproj b/test/Visitor/Visitor.vcproj
index 81daa43..8b8b3c7 100755
--- a/test/Visitor/Visitor.vcproj
+++ b/test/Visitor/Visitor.vcproj
@@ -116,6 +116,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
diff --git a/test/flex_string/flex_string.vcproj b/test/flex_string/flex_string.vcproj
index 52e7a50..300a036 100755
--- a/test/flex_string/flex_string.vcproj
+++ b/test/flex_string/flex_string.vcproj
@@ -116,6 +116,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"