diff --git a/webservice/atompub/cmis/index.php b/webservice/atompub/cmis/index.php
index 6f28d79..939f04a 100644
--- a/webservice/atompub/cmis/index.php
+++ b/webservice/atompub/cmis/index.php
@@ -79,6 +79,9 @@ $APP = new KT_cmis_atom_server();
 
 $queryArray = split('/', trim($_SERVER['QUERY_STRING'], '/'));
 $workspace = strtolower(trim($queryArray[0]));
+if (empty($workspace)) {
+    $workspace = 'servicedocument';
+}
 if ($workspace == 'servicedocument')
 {
     // CMIS service document setup
diff --git a/webservice/classes/atompub/KT_atom_server.inc.php b/webservice/classes/atompub/KT_atom_server.inc.php
index 65c007c..7ddd816 100644
--- a/webservice/classes/atompub/KT_atom_server.inc.php
+++ b/webservice/classes/atompub/KT_atom_server.inc.php
@@ -33,6 +33,10 @@ class KT_atom_server {
 		$rawRequest=@file_get_contents('php://input');
 
         $workspace=strtolower(trim($queryArray[0]));
+        if (empty($workspace)) {
+            $workspace = 'servicedocument';
+        }
+        
 		$serviceName=strtolower(trim($queryArray[1]));
 		$requestParams=array_slice($queryArray,2);
 		$this->queryArray=$queryArray;
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
index c0b919c..ccb5a43 100644
--- a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
@@ -58,6 +58,10 @@ class KT_cmis_atom_server extends KT_atom_server {
 	public function serviceDocument()
     {
 		$service = new KT_cmis_atom_serviceDoc(KT_APP_BASE_URI);
+		
+		header('Content-Type: application/atomsvc+xml;charset=UTF-8');
+        header('Content-Disposition', 'attachment;filename="knowledgetree_cmis"');
+		$this->headersSet = true;
 
 		foreach($this->services as $workspace => $collection)
         {
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_service.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_service.inc.php
index 0fab708..ad54e85 100644
--- a/webservice/classes/atompub/cmis/KT_cmis_atom_service.inc.php
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_service.inc.php
@@ -66,9 +66,11 @@ class KT_cmis_atom_service extends KT_atom_service {
         return $this->serviceType;
     }
     
-    public function setHeader($header = null, $value = null)
+    public function setHeader($header, $value = null)
     {
-		if ($header) header($header . ': ' . $value);
+		if (!empty($header)) {
+		    header($header . ': ' . $value);
+		}
 	}
 	
 	public function getStatusCode($exception)