diff --git a/livesupport/modules/storageServer/var/conf.php b/livesupport/modules/storageServer/var/conf.php
index 836db911a..a8ce89fd7 100644
--- a/livesupport/modules/storageServer/var/conf.php
+++ b/livesupport/modules/storageServer/var/conf.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.9 $
+    Version  : $Revision: 1.10 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -65,10 +65,10 @@ $config = array(
     'tblNamePrefix' => 'ls_',
     'authCookieName'=> 'lssid',
     'StationPrefsGr'=> 'StationPrefs',
-    'storageDir'    =>  dirname(getcwd()).'/stor',
-    'bufferDir'     =>  dirname(getcwd()).'/stor/buffer',
-    'transDir'      =>  dirname(getcwd()).'/trans',
-    'accessDir'     =>  dirname(getcwd()).'/access',
+    'storageDir'    =>  dirname(__FILE__).'/stor',
+    'bufferDir'     =>  dirname(__FILE__).'/stor/buffer',
+    'transDir'      =>  dirname(__FILE__).'/trans',
+    'accessDir'     =>  dirname(__FILE__).'/access',
     'isArchive'     =>  FALSE,
 
     /* ==================================================== URL configuration */
diff --git a/livesupport/modules/storageServer/var/html/gbHtmlBrowse.php b/livesupport/modules/storageServer/var/html/gbHtmlBrowse.php
index 0b40ee59c..3cd9fa9f6 100644
--- a/livesupport/modules/storageServer/var/html/gbHtmlBrowse.php
+++ b/livesupport/modules/storageServer/var/html/gbHtmlBrowse.php
@@ -29,7 +29,7 @@ switch($_REQUEST['act']){
 #        echo"<pre>\n$path\n$upath<hr>\n"; print_r($_FILES); print_r($_REQUEST); exit;
         $tpldata=array_merge($tpldata, array(
             'pathdata'  => $gb->getPath($id, $sessid),
-            'listdata'  => ($gb->getObjType($id)=='Folder'?
+            'listdata'  => ($gb->getFileType($id)=='Folder'?
                 $gb->listFolder($id, $sessid):array()
             ),
             'tree'  => ($_REQUEST['tree']=='Y'),
diff --git a/livesupport/modules/storageServer/var/tests/webstreamTest.php b/livesupport/modules/storageServer/var/tests/webstreamTest.php
index 38450b71d..d1884e401 100644
--- a/livesupport/modules/storageServer/var/tests/webstreamTest.php
+++ b/livesupport/modules/storageServer/var/tests/webstreamTest.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.1 $
+    Version  : $Revision: 1.2 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/tests/webstreamTest.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -42,7 +42,8 @@ $gb = &new GreenBox($dbc, $config);
 
 #$gunid = "123456789abcdee0";
 $gunid = "";
-$mdataFileLP = '../tests/mdata1.xml';
+#$mdataFileLP = '../tests/mdata1.xml';
+$mdataFileLP = NULL;
 
 echo"#  Login: ".($sessid = $gb->login('root', 'q'))."\n";
 $parid = $gb->_getHomeDirId($sessid);