diff --git a/base/stdistream.h b/base/stdistream.h
index 6f83b5bb..d19ef632 100644
--- a/base/stdistream.h
+++ b/base/stdistream.h
@@ -6,8 +6,8 @@
 #endif
 #include "stdpost.h"
 
-#if defined(_MSC_VER)
-// istream has no overloads for __int* types
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+// VC++6 istream has no overloads for __int* types, .NET does
 inline
 std::istream& operator>>(std::istream& s, SInt8& i)
 { return s >> (signed char&)i; }
diff --git a/io/CStreamBuffer.cpp b/io/CStreamBuffer.cpp
index fa3e68ad..d906d94b 100644
--- a/io/CStreamBuffer.cpp
+++ b/io/CStreamBuffer.cpp
@@ -35,7 +35,7 @@ CStreamBuffer::peek(UInt32 n)
 		scan = m_chunks.erase(scan);
 	}
 
-	return reinterpret_cast<const void*>(head->begin() + m_headUsed);
+	return reinterpret_cast<const void*>(&(head->begin()[m_headUsed]));
 }
 
 void