diff --git a/setup/lang.php b/setup/lang.php
index 0eac91c762..831c784ace 100644
--- a/setup/lang.php
+++ b/setup/lang.php
@@ -11,8 +11,7 @@
 
   /* $Id$ */
 
-  $phpgw_info["flags"] = array("noheader"   => True,   "nonavbar" => True,
-  							 "currentapp" => "home", "noapi"    => True);
+  $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "home", "noapi"  => True);
   include("../header.inc.php");
   include("./inc/functions.inc.php");
 
diff --git a/setup/sql/common_main.inc.php b/setup/sql/common_main.inc.php
index 5565329aab..7c2f244130 100644
--- a/setup/sql/common_main.inc.php
+++ b/setup/sql/common_main.inc.php
@@ -30,7 +30,7 @@
     include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_newtables.inc.php");
     include("./sql/common_default_records.inc.php");
     $included = True;
-    include($phpgw_info["server"]["server_root"] . "/setup/lang.php");
+//    include($phpgw_info["server"]["server_root"] . "/setup/lang.php");
     $phpgw_info["setup"]["currentver"]["phpgwapi"] = "oldversion";
   }
 
diff --git a/setup/sql/mysql_droptables.inc.php b/setup/sql/mysql_droptables.inc.php
index db46a738bc..a2dd00fa85 100644
--- a/setup/sql/mysql_droptables.inc.php
+++ b/setup/sql/mysql_droptables.inc.php
@@ -19,6 +19,7 @@
   $phpgw_setup->db->query("DROP TABLE phpgw_sessions");
   $phpgw_setup->db->query("DROP TABLE phpgw_app_sessions");
   $phpgw_setup->db->query("DROP TABLE phpgw_acl");
+  $phpgw_setup->db->query("DROP TABLE phpgw_hooks");
   $phpgw_setup->db->query("DROP TABLE phpgw_access_log");
   $phpgw_setup->db->query("DROP TABLE profiles");
   $phpgw_setup->db->query("DROP TABLE addressbook");
diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php
index 37b578fb95..8e53e6660d 100644
--- a/setup/sql/mysql_upgrade_beta.inc.php
+++ b/setup/sql/mysql_upgrade_beta.inc.php
@@ -775,7 +775,7 @@
       $ver();
       echo "<table>";
       echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $value to $phpgw_info["setup"]["currentver"]["phpgwapi"] is completed.</td>\n";
+      echo "    <td>Upgrade from $value to ".$phpgw_info["setup"]["currentver"]["phpgwapi"]." is completed.</td>\n";
       echo "  </tr>\n";
       echo "</table>";
       if ($tableschanged == True){$tablechanges = True;}