diff --git a/CHANGES b/CHANGES
index 5bcadaf..69e8b38 100755
--- a/CHANGES
+++ b/CHANGES
@@ -30,7 +30,7 @@ TypeTraits:
 flex_string:
     - fixed compare bug by updating (Thanks to Justin Matthews, pk)
     - fixed seg faults on linux and windows (pk)
-    - improved error reporting of the test program
+    - improved error reporting of the test program (pk)
     
 SmartPtr:
     - make object level locking possible (Thanks to Ryan Smith, pk)
diff --git a/include/loki/TypeTraits.h b/include/loki/TypeTraits.h
index c08bca5..84fb5f3 100644
--- a/include/loki/TypeTraits.h
+++ b/include/loki/TypeTraits.h
@@ -4,6 +4,10 @@
 #include "Typelist.h"
 #include "Sequence.h"
 
+#if (defined _MSC_VER) && (_MSC_VER < 1400)
+#include <string>
+#endif
+
 namespace Loki
 {
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/RegressionTest/SingletonTest.h b/test/RegressionTest/SingletonTest.h
index 6628bfb..0bf56e2 100755
--- a/test/RegressionTest/SingletonTest.h
+++ b/test/RegressionTest/SingletonTest.h
@@ -157,6 +157,8 @@ private:
 
 #ifdef LOKI_NONCC
 #include "../../include/noncc/loki/Singleton.cpp"
+#else
+#include "../../src/Singleton.cpp"
 #endif
 
 #endif
diff --git a/test/RegressionTest/make.msvc.bat b/test/RegressionTest/make.msvc.bat
index 5a10cdc..b8b2451 100755
--- a/test/RegressionTest/make.msvc.bat
+++ b/test/RegressionTest/make.msvc.bat
@@ -2,5 +2,5 @@ if not exist tmp\ mkdir tmp
 
 cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ Test.cpp
 
-link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\Test.obj
+link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" ..\..\lib\loki.lib tmp\Test.obj