diff --git a/config/alfresco/desktop/Alfresco.exe b/config/alfresco/desktop/Alfresco.exe
index 6d1410ea0d..85a1b543eb 100644
Binary files a/config/alfresco/desktop/Alfresco.exe and b/config/alfresco/desktop/Alfresco.exe differ
diff --git a/source/cpp/CAlfrescoApp/CAlfrescoApp.cpp b/source/cpp/CAlfrescoApp/CAlfrescoApp.cpp
index a02c212c8e..18221d552a 100644
--- a/source/cpp/CAlfrescoApp/CAlfrescoApp.cpp
+++ b/source/cpp/CAlfrescoApp/CAlfrescoApp.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 "stdafx.h"
@@ -179,6 +171,11 @@ BOOL CAlfrescoApp::InitInstance()
 		DBGOUT_TS << "Using document path as working directory, " << folderPath << endl;
 	}
 
+	// DEBUG
+
+	if ( HAS_DEBUG)
+		DBGOUT_TS << "Using folder path " << folderPath << " for Alfresco base dir" << endl;
+
 	// Create the Alfresco interface
 
 	AlfrescoInterface alfresco(folderPath);
diff --git a/source/cpp/CAlfrescoApp/source/alfresco/Alfresco.cpp b/source/cpp/CAlfrescoApp/source/alfresco/Alfresco.cpp
index 492441d841..b221122c2f 100644
--- a/source/cpp/CAlfrescoApp/source/alfresco/Alfresco.cpp
+++ b/source/cpp/CAlfrescoApp/source/alfresco/Alfresco.cpp
@@ -19,6 +19,7 @@
 #include "util\DataBuffer.h"
 #include "util\Exception.h"
 #include "util\Integer.h"
+#include "util\Debug.h"
 
 #include <WinNetWk.h>
 
@@ -251,7 +252,7 @@ DesktopResponse AlfrescoInterface::runAction(AlfrescoActionInfo& action, Desktop
 	// Build the run action I/O control request
 
 	DataBuffer reqbuf( 1024);
-	DataBuffer respbuf( 16384);
+	DataBuffer respbuf( 16 * 1024);
 
 	reqbuf.putFixedString( IOSignature, IOSignatureLen);
 	reqbuf.putString( action.getName());
@@ -282,40 +283,6 @@ DesktopResponse AlfrescoInterface::runAction(AlfrescoActionInfo& action, Desktop
 	return response;
 }
 
-/**
- * Get the authentication ticket for this session
- *
- * @return DesktopResponse
- */
-DesktopResponse AlfrescoInterface::getAuthenticationTicket( void) {
-
-	// Check if the folder handle is valid
-
-	if ( m_handle == INVALID_HANDLE_VALUE)
-		throw BadInterfaceException();
-
-	// Build the run action I/O control request
-
-	DataBuffer reqbuf( 32);
-	DataBuffer respbuf( 256);
-
-	reqbuf.putFixedString( IOSignature, IOSignatureLen);
-
-	// Send the get auth ticket request
-
-	sendIOControl( FSCTL_ALFRESCO_GETAUTHTICKET, reqbuf, respbuf);
-
-	// Unpack the get auth ticket response
-
-	unsigned int actionSts = respbuf.getInt();
-	String actionMsg = respbuf.getString();
-
-	// Return the desktop response
-
-	DesktopResponse response(actionSts, actionMsg);
-	return response;
-}
-
 /**
  * Send an I/O control request to the Alfresco CIFS server, receive and validate the response
  *
@@ -411,7 +378,19 @@ 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, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+			m_handle = CreateFile(m_uncPath, FILE_READ_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+
+			if ( m_handle == INVALID_HANDLE_VALUE) {
+				
+				// DEBUG
+
+				if ( HAS_DEBUG)
+					DBGOUT_TS << "%% Error opening folder " << m_uncPath << ", error " << GetLastError() << endl;
+
+				// Error, failed to open folder on Alfresco CIFS share
+
+				return false;
+			}
 		}
 
 		// Set the root path