diff --git a/base/source/c/compile_windows_i386.mak b/base/source/c/compile_windows_i386.mak
index 358d8889872bfc7a4e595468cf719adbef5b9986..e5f53e70bec89e6b151b70ee8fe6a00399e7750b 100644
--- a/base/source/c/compile_windows_i386.mak
+++ b/base/source/c/compile_windows_i386.mak
@@ -6,7 +6,7 @@
 #============================================================================
 
 # Visual C++ directory, for example
-VCPPDIR=C:\Program Files\Microsoft Visual Studio 8\VC
+VCPPDIR=C:\Program Files\Microsoft Visual Studio 9.0\VC
 
 # Directory where JDK is installed (We require JDK 1.5 or above), for example
 JAVADIR=C:\Program Files\Java\jdk1.5.0_22
diff --git a/base/source/c/compile_windows_x64.mak b/base/source/c/compile_windows_x64.mak
index 111b06c1493acf84d0da2f30781a6821dc6d3f60..ac92a1733ce0168e6edfc12cbaaafa34b3dabb46 100644
--- a/base/source/c/compile_windows_x64.mak
+++ b/base/source/c/compile_windows_x64.mak
@@ -6,7 +6,7 @@
 #============================================================================
 
 # Visual C++ directory, for example
-VCPPDIR=C:\Program Files (x86)\Microsoft Visual Studio 8\VC
+VCPPDIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC
 
 # Directory where JDK is installed (We require JDK 1.5 or above), for example
 JAVADIR=C:\Program Files\Java\jdk1.5.0_22
diff --git a/base/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java b/base/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
index 2203d2e79bda0448d8f3bd6677f3980ac0d681bf..4432c393944d5325add21e402da178129d951e4e 100644
--- a/base/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
+++ b/base/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
@@ -324,12 +324,18 @@ public class NativeDataTests
         NativeData.copyByteToLong(null, 0, null, 0, 0, ByteOrder.NATIVE);
     }
 
-    @Test(expectedExceptions = {IllegalArgumentException.class, IndexOutOfBoundsException.class})
-    public void testIAE()
+    @Test(expectedExceptions = IndexOutOfBoundsException.class)
+    public void testIOOB()
     {
         NativeData.copyByteToLong(new byte[] {}, -1, new long[] {}, 0, 0, ByteOrder.NATIVE);
     }
 
+    @Test(expectedExceptions = IndexOutOfBoundsException.class)
+    public void testIOOB2()
+    {
+        NativeData.copyByteToLong(new byte[] {}, 0, new long[] {}, 10, 0, ByteOrder.NATIVE);
+    }
+
     @Test
     public void testPlatformEndiness()
     {