diff --git a/lib/upgrades/Ini.inc.php b/lib/upgrades/Ini.inc.php
index e3886a4..b444075 100644
--- a/lib/upgrades/Ini.inc.php
+++ b/lib/upgrades/Ini.inc.php
@@ -187,7 +187,7 @@ class Ini {
 
         if(!$this->itemExists($delSection, $delItem)) return false;
 
-        unset(this->cleanArray[$delSection][$delItem]);
+        unset($this->cleanArray[$delSection][$delItem]);
         return true;
     }
     
diff --git a/lib/upgrades/UpgradeFunctions.inc.php b/lib/upgrades/UpgradeFunctions.inc.php
index 10e16ff..ce15b0e 100644
--- a/lib/upgrades/UpgradeFunctions.inc.php
+++ b/lib/upgrades/UpgradeFunctions.inc.php
@@ -967,7 +967,8 @@ class UpgradeFunctions {
     // {{{ updateConfigFile35
     function updateConfigFile35()
     {
-    	$configPath = KTConfig::getConfigFilename();
+    	$config = KTConfig::getSingleton();
+        $configPath = KTConfig::getConfigFilename();
     	$configPath = str_replace(array("\n","\r"), array('',''), $configPath);
 
         if(file_exists($configPath)) {
@@ -1074,9 +1075,9 @@ class UpgradeFunctions {
             $ini->addItem('CustomErrorMessages', 'customerrorhandler', 'on', 'Turn custom error handler on or off');
 
             // URLS Section
-            $ini->addItem('urls', 'varDirectory', '${fileSystemRoot}/var', 'directories');
+            $ini->addItem('urls', 'varDirectory', $config->get("urls/varDirectory"), 'directories');
             $ini->addItem('urls', 'logDirectory', '${varDirectory}/log');
-            $ini->addItem('urls', 'documentRoot', '${fileSystemRoot}/Documents');
+            $ini->addItem('urls', 'documentRoot', $config->get("urls/documentRoot"));
             $ini->addItem('urls', 'uiDirectory', '${fileSystemRoot}/presentation/lookAndFeel/knowledgeTree');
             $ini->addItem('urls', 'tmpDirectory', '${varDirectory}/tmp');
             $ini->addItem('urls', 'graphicsUrl', '${rootUrl}/graphics', 'urls');
diff --git a/sql/mysql/upgrade/3.5.2/clean_plugin_helper.sql b/sql/mysql/upgrade/3.5.2/clean_plugin_helper.sql
index a6bfe51..2b4167b 100644
--- a/sql/mysql/upgrade/3.5.2/clean_plugin_helper.sql
+++ b/sql/mysql/upgrade/3.5.2/clean_plugin_helper.sql
@@ -1 +1 @@
-DELETE * FROM plugin_helper;
+DELETE FROM plugin_helper;