diff --git a/build/linux/platform_specific_code/juce_linux_AudioCDReader.cpp b/build/linux/platform_specific_code/juce_linux_AudioCDReader.cpp
index 7bcaa6f7cc..c09eb54148 100644
--- a/build/linux/platform_specific_code/juce_linux_AudioCDReader.cpp
+++ b/build/linux/platform_specific_code/juce_linux_AudioCDReader.cpp
@@ -61,9 +61,8 @@ void AudioCDReader::refreshTrackLengths()
 {
 }
 
-bool AudioCDReader::read (int** destSamples,
-                          int64 startSampleInFile,
-                          int numSamples)
+bool AudioCDReader::readSamples (int** destSamples, int numDestChannels, int startOffsetInDestBuffer,
+                                 int64 startSampleInFile, int numSamples)
 {
     return false;
 }
diff --git a/build/win32/vc8/JUCE.vcproj b/build/win32/vc8/JUCE.vcproj
index 40bedb80a1..cb3c82ddf1 100644
--- a/build/win32/vc8/JUCE.vcproj
+++ b/build/win32/vc8/JUCE.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="JUCE"
 	ProjectGUID="{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}"
 	RootNamespace="JUCE"
diff --git a/src/juce_core/io/network/juce_Socket.cpp b/src/juce_core/io/network/juce_Socket.cpp
index 961e85cd04..58c82081a4 100644
--- a/src/juce_core/io/network/juce_Socket.cpp
+++ b/src/juce_core/io/network/juce_Socket.cpp
@@ -90,21 +90,20 @@ static void initWin32Sockets()
 //==============================================================================
 static bool resetSocketOptions (const int handle, const bool isDatagram) throw()
 {
-    if (handle <= 0)
-        return false;
-
     const int sndBufSize = 65536;
     const int rcvBufSize = 65536;
     const int one = 1;
 
-    return setsockopt (handle, SOL_SOCKET, SO_RCVBUF, (const char*) &rcvBufSize, sizeof (int)) == 0
-            && setsockopt (handle, SOL_SOCKET, SO_SNDBUF, (const char*) &sndBufSize, sizeof (int)) == 0
-            && (isDatagram || (setsockopt (handle, IPPROTO_TCP, TCP_NODELAY, (const char*) &one, sizeof (int)) == 0));
+    return handle > 0
+            && setsockopt (handle, SOL_SOCKET, SO_RCVBUF, (const char*) &rcvBufSize, sizeof (rcvBufSize)) == 0
+            && setsockopt (handle, SOL_SOCKET, SO_SNDBUF, (const char*) &sndBufSize, sizeof (sndBufSize)) == 0
+            && (isDatagram ? (setsockopt (handle, SOL_SOCKET, SO_BROADCAST, (const char*) &one, sizeof (one)) == 0)
+                           : (setsockopt (handle, IPPROTO_TCP, TCP_NODELAY, (const char*) &one, sizeof (one)) == 0));
 }
 
 static bool bindSocketToPort (const int handle, const int port) throw()
 {
-    if (handle == 0 || port <= 0)
+    if (handle <= 0 || port <= 0)
         return false;
 
     struct sockaddr_in servTmpAddr;
diff --git a/src/juce_core/text/juce_String.cpp b/src/juce_core/text/juce_String.cpp
index a6f435ae6f..adb3c96112 100644
--- a/src/juce_core/text/juce_String.cpp
+++ b/src/juce_core/text/juce_String.cpp
@@ -1375,6 +1375,9 @@ const String String::replaceSection (int index,
 
     const int newStringLen = (stringToInsert != 0) ? CharacterFunctions::length (stringToInsert) : 0;
     const int newTotalLen = len + newStringLen - numCharsToReplace;
+    
+    if (newTotalLen <= 0)
+        return String::empty;
 
     String result (newTotalLen, (int) 0);