diff --git a/make-msvc.bat b/make-msvc.bat
index d8097d1..007254e 100644
--- a/make-msvc.bat
+++ b/make-msvc.bat
@@ -43,6 +43,7 @@ call %1 %2
 if "%2" == "x86" set SLN_TRG=Win32
 if "%2" == "x86" set LIB_TRG=lib32
 if "%2" == "x64" set SLN_TRG=x64
+<<<<<<< HEAD
 if "%2" == "x64" set LIB_TRG=lib64
 devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugAD|%SLN_TRG%"
 xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\DebugAD\*.lib ..\aaa\%LIB_TRG%%4
@@ -60,6 +61,16 @@ devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseUD|%SLN_TRG%"
 xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\ReleaseUD\*.lib ..\aaa\%LIB_TRG%%4
 devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseUS|%SLN_TRG%"
 xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\ReleaseUS\*.lib ..\aaa\%LIB_TRG%%4
+=======
+devenv.com %3 /project "%LIB_NAME%" /build "DebugAD|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /build "DebugAS|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /build "DebugUD|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /build "DebugUS|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /build "ReleaseAD|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /build "ReleaseAS|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /build "ReleaseUD|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /build "ReleaseUS|%SLN_TRG%"
+>>>>>>> 1a94f94b50f6d829b1e8fba08a3002a5db4f00d5
 
 :: Restore environment variables to the old level
 set INCLUDE=%SAVE_INCLUDE%
diff --git a/test/StormTest.cpp b/test/StormTest.cpp
index 13b0ace..1f8a334 100644
--- a/test/StormTest.cpp
+++ b/test/StormTest.cpp
@@ -4336,40 +4336,40 @@ int _tmain(int argc, TCHAR * argv[])
     // Search all testing archives and verify their SHA1 hash
     //
 
-    if(dwErrCode == ERROR_SUCCESS)
-    {
-        dwErrCode = FindFiles(ForEachFile_VerifyFileChecksum, szMpqSubDir);
-    }
+    //if(dwErrCode == ERROR_SUCCESS)
+    //{
+    //    dwErrCode = FindFiles(ForEachFile_VerifyFileChecksum, szMpqSubDir);
+    //}
 
     //
     // Test file stream operations
     //
 
-    if(dwErrCode == ERROR_SUCCESS)
-    {
-        for(size_t i = 0; i < _countof(TestList_StreamOps); i++)
-        {
-            dwErrCode = TestFileStreamOperations(TestList_StreamOps[i].szMpqName1, TestList_StreamOps[i].dwFlags);
-            if(dwErrCode != ERROR_SUCCESS)
-                break;
-        }
-    }
+    //if(dwErrCode == ERROR_SUCCESS)
+    //{
+    //    for(size_t i = 0; i < _countof(TestList_StreamOps); i++)
+    //    {
+    //        dwErrCode = TestFileStreamOperations(TestList_StreamOps[i].szMpqName1, TestList_StreamOps[i].dwFlags);
+    //        if(dwErrCode != ERROR_SUCCESS)
+    //            break;
+    //    }
+    //}
 
     //
     // Test master-mirror reading operations
     //
 
-    if(dwErrCode == ERROR_SUCCESS)
-    {
-        for(size_t i = 0; i < _countof(TestList_MasterMirror); i++)
-        {
-            dwErrCode = TestReadFile_MasterMirror(TestList_MasterMirror[i].szMpqName1,
-                                                  TestList_MasterMirror[i].szMpqName2,
-                                                  TestList_MasterMirror[i].dwFlags != 0);
-            if(dwErrCode != ERROR_SUCCESS)
-                break;
-        }
-    }
+    //if(dwErrCode == ERROR_SUCCESS)
+    //{
+    //    for(size_t i = 0; i < _countof(TestList_MasterMirror); i++)
+    //    {
+    //        dwErrCode = TestReadFile_MasterMirror(TestList_MasterMirror[i].szMpqName1,
+    //                                              TestList_MasterMirror[i].szMpqName2,
+    //                                              TestList_MasterMirror[i].dwFlags != 0);
+    //        if(dwErrCode != ERROR_SUCCESS)
+    //            break;
+    //    }
+    //}
 
     //
     // Test opening various archives - correct, damaged, protected
diff --git a/test/TLogHelper.cpp b/test/TLogHelper.cpp
index 3d09823..7129b63 100644
--- a/test/TLogHelper.cpp
+++ b/test/TLogHelper.cpp
@@ -120,7 +120,7 @@ TLogHelper::~TLogHelper()
 #if defined(_MSC_VER) && defined(_DEBUG)
     if(_CrtDumpMemoryLeaks())
     {
-        PrintMessage(_T("Memory leak(s) detected after %s.\n"), szSaveMainTitle);
+        PrintMessage(_T("Memory leak(s) detected after.\n"));
     }
 #endif  // _MSC_VER
 }
@@ -423,7 +423,7 @@ char * TLogHelper::CopyFormatCharacter(char * szBuffer, const char *& szFormat)
     // String format
     if(szFormat[0] == '%')
     {
-        if(szFormat[1] == 's' && szFormat[2] != ')')
+        if(szFormat[1] == 's')
         {
             strcpy(szBuffer, szStringFormat);
             szFormat += 2;