diff --git a/phpgwapi/inc/class.db.inc.php b/phpgwapi/inc/class.db.inc.php
index a1f4e9d3e6..d2e6266024 100644
--- a/phpgwapi/inc/class.db.inc.php
+++ b/phpgwapi/inc/class.db.inc.php
@@ -1,4 +1,7 @@
 <?php 
-  if (empty($phpgw_info['server']['db_type'])){$phpgw_info['server']['db_type'] = 'mysql';}
-  include(PHPGW_API_INC.'/class.db_'.$phpgw_info['server']['db_type'].'.inc.php'); 
-?>
\ No newline at end of file
+	if (empty($GLOBALS['phpgw_info']['server']['db_type']))
+	{
+		$GLOBALS['phpgw_info']['server']['db_type'] = 'mysql';
+	}
+	include(PHPGW_API_INC.'/class.db_'.$GLOBALS['phpgw_info']['server']['db_type'].'.inc.php'); 
+?>
diff --git a/phpgwapi/inc/footer.inc.php b/phpgwapi/inc/footer.inc.php
index e5089bd43f..f586f5bc3e 100644
--- a/phpgwapi/inc/footer.inc.php
+++ b/phpgwapi/inc/footer.inc.php
@@ -35,10 +35,10 @@
 	* Include the apps footer files if it exists                               *
 	\**************************************************************************/
 	if (file_exists (PHPGW_APP_INC . '/footer.inc.php') &&
-		$phpgw_info['flags']['currentapp'] != 'home' &&
-		$phpgw_info['flags']['currentapp'] != 'login' &&
-		$phpgw_info['flags']['currentapp'] != 'logout' &&
-		!@$phpgw_info['flags']['noappfooter'])
+		$GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
+		$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
+		$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
+		!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
 	{
 		if ($menuaction)
 		{
@@ -67,7 +67,7 @@
 	}
 
 	parse_navbar_end();
-	$phpgw->db->disconnect();
+	$GLOBALS['phpgw']->db->disconnect();
   
 ?>
 </BODY>