diff --git a/make-msvc.bat b/make-msvc.bat
new file mode 100644
index 0000000..fe54111
--- /dev/null
+++ b/make-msvc.bat
@@ -0,0 +1,2 @@
+set path=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE
+devenv "StormLib_v09.sln" /build "Debug|Win32" /project "StormLib_test.vcproj" /projectconfig "Debug|Win32"
diff --git a/src/SBaseFileTable.cpp b/src/SBaseFileTable.cpp
index 52d37d3..b293574 100644
--- a/src/SBaseFileTable.cpp
+++ b/src/SBaseFileTable.cpp
@@ -1363,7 +1363,9 @@ static TMPQExtHeader * TranslateHetTable(TMPQHetTable * pHetTable, ULONGLONG * p
         }
     }
 
-    return &pHetHeader->ExtHdr;
+    // Keep Coverity happy
+    assert((TMPQExtHeader *)&pHetHeader->ExtHdr == (TMPQExtHeader *)pbLinearTable);
+    return (TMPQExtHeader *)pbLinearTable;
 }
 
 static DWORD GetFileIndex_Het(TMPQArchive * ha, const char * szFileName)
@@ -1758,7 +1760,9 @@ TMPQExtHeader * TranslateBetTable(
         }
     }
 
-    return &pBetHeader->ExtHdr;
+    // Keep Coverity happy
+    assert((TMPQExtHeader *)&pBetHeader->ExtHdr == (TMPQExtHeader *)pbLinearTable);
+    return (TMPQExtHeader *)pbLinearTable;
 }
 
 void FreeBetTable(TMPQBetTable * pBetTable)