diff --git a/config/alfresco/desktop/Alfresco.exe b/config/alfresco/desktop/Alfresco.exe
index 4025d6490a..6d1410ea0d 100644
Binary files a/config/alfresco/desktop/Alfresco.exe and b/config/alfresco/desktop/Alfresco.exe differ
diff --git a/source/cpp/CAlfrescoApp/source/alfresco/Alfresco.cpp b/source/cpp/CAlfrescoApp/source/alfresco/Alfresco.cpp
index 9dc1f947ff..492441d841 100644
--- a/source/cpp/CAlfrescoApp/source/alfresco/Alfresco.cpp
+++ b/source/cpp/CAlfrescoApp/source/alfresco/Alfresco.cpp
@@ -251,7 +251,7 @@ DesktopResponse AlfrescoInterface::runAction(AlfrescoActionInfo& action, Desktop
 	// Build the run action I/O control request
 
 	DataBuffer reqbuf( 1024);
-	DataBuffer respbuf( 4096);
+	DataBuffer respbuf( 16384);
 
 	reqbuf.putFixedString( IOSignature, IOSignatureLen);
 	reqbuf.putString( action.getName());
@@ -411,7 +411,7 @@ bool AlfrescoInterface::setRootPath( const wchar_t* rootPath) {
 
 			// Open the path
 
-			m_handle = CreateFile(m_uncPath, FILE_WRITE_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+			m_handle = CreateFile(m_uncPath, FILE_WRITE_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
 		}
 
 		// Set the root path
diff --git a/source/cpp/CAlfrescoApp/source/util/DataBuffer.cpp b/source/cpp/CAlfrescoApp/source/util/DataBuffer.cpp
index ef839f1e85..ba923d25b9 100644
--- a/source/cpp/CAlfrescoApp/source/util/DataBuffer.cpp
+++ b/source/cpp/CAlfrescoApp/source/util/DataBuffer.cpp
@@ -1,26 +1,18 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2006 Alfresco, Inc.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
- * http://www.alfresco.com/legal/licensing"
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
  */
 
 #include "util\DataBuffer.h"
@@ -190,7 +182,7 @@ LONG64 DataBuffer::getLong( void) {
  * @return String
  */
 String DataBuffer::getString( bool uni) {
-	return getString( 255, uni);
+	return getString( getAvailableLength(), uni);
 }
 
 /**
diff --git a/source/java/org/alfresco/filesys/repo/ContentIOControlHandler.java b/source/java/org/alfresco/filesys/repo/ContentIOControlHandler.java
index 3eddd2ca2a..fa2037471e 100644
--- a/source/java/org/alfresco/filesys/repo/ContentIOControlHandler.java
+++ b/source/java/org/alfresco/filesys/repo/ContentIOControlHandler.java
@@ -204,7 +204,7 @@ public class ContentIOControlHandler implements IOControlHandler
         if ( dataBuf.getLength() < IOControl.Signature.length())
             throw new IOControlNotImplementedException("Bad request length");
         
-        String sig = dataBuf.getString(IOControl.Signature.length(), false);
+        String sig = dataBuf.getFixedString(IOControl.Signature.length(), false);
         
         if ( sig == null || sig.compareTo(IOControl.Signature) != 0)
             throw new IOControlNotImplementedException("Bad request signature");