diff --git a/setup/sql/pgsql_droptables.inc.php b/setup/sql/pgsql_droptables.inc.php
index 366327a7d6..bae1f9311a 100644
--- a/setup/sql/pgsql_droptables.inc.php
+++ b/setup/sql/pgsql_droptables.inc.php
@@ -41,17 +41,19 @@
   $phpgw_setup->db->query("drop sequence news_msg_con_seq");
   $phpgw_setup->db->query("DROP TABLE news_msg");
   $phpgw_setup->db->query("DROP TABLE languages");
-  //$phpgw_setup->db->query("drop sequence categories_cat_id_seq");
-  //$phpgw_setup->db->query("DROP TABLE categories");
+  $phpgw_setup->db->query("drop sequence categories_cat_id_seq");
+  $phpgw_setup->db->query("DROP TABLE categories");
+  $phpgw_setup->db->query("DROP sequence phpgw_notes_note_id_seq");
+  $phpgw_setup->db->query("DROP TABLE phpgw_notes");
+
+  $phpgw_setup->db->query("DROP TABLE config");
+  $phpgw_setup->db->query("DROP TABLE applications");
+  $phpgw_setup->db->query("drop sequence groups_group_id_seq");
+  $phpgw_setup->db->query("DROP TABLE groups");
+  $phpgw_setup->db->query("drop sequence accounts_account_id_seq");
+  $phpgw_setup->db->query("DROP TABLE accounts");
+  $phpgw_setup->db->query("DROP TABLE preferences");
   $phpgw_setup->db->query("DROP sequence notes_note_id_seq");
   $phpgw_setup->db->query("DROP TABLE notes");
 
-  //$phpgw_setup->db->query("DROP TABLE config");
-  //$phpgw_setup->db->query("DROP TABLE applications");
-  //$phpgw_setup->db->query("drop sequence groups_group_id_seq");
-  //$phpgw_setup->db->query("DROP TABLE groups");
-  //$phpgw_setup->db->query("drop sequence accounts_account_id_seq");
-  //$phpgw_setup->db->query("DROP TABLE accounts");
-  //$phpgw_setup->db->query("DROP TABLE preferences");
-
 ?>
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index 152409cdde..2946d97185 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -1060,7 +1060,7 @@
   {
 		global $phpgw_info, $phpgw_setup;
 
-		$phpgw_setup->db->query('alter table preferences rename phpgw_preferences',__LINE__,__FILE__);
+		$phpgw_setup->db->query('alter table preferences rename to phpgw_preferences',__LINE__,__FILE__);
      
 		$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre10';
   }