diff --git a/pg4wp/db.php b/pg4wp/db.php
index 471b334..dc8ab10 100644
--- a/pg4wp/db.php
+++ b/pg4wp/db.php
@@ -36,6 +36,13 @@ require_once( PG4WP_ROOT.'/driver_'.DB_DRIVER.'.php');
 
 // This loads up the wpdb class applying the appropriate changes to it, DON'T TOUCH !
 $replaces = array(
+	'define( '	=> '// define( ',
+	' OBJECT_K'	=> ' \'OBJECT_K\'',
+	' OBJECT'	=> ' \'OBJECT\'',
+	' ARRAY_A'	=> ' \'ARRAY_A\'',
+	' ARRAY_N'	=> ' \'ARRAY_N\'',
+	'class wpdb'	=> 'class wpdb2',
+	'new wpdb'	=> 'new wpdb2',
 	'mysql_'	=> 'wpsql_',
 	'<?php'		=> '',
 	'?>'		=> '',
diff --git a/readme.txt b/readme.txt
index 643f5cd..7fffef5 100644
--- a/readme.txt
+++ b/readme.txt
@@ -50,6 +50,7 @@ There is no screenshot for this plugin
 
 == Changelog ==
 
+* Improved db.php to remove notices and possible fatal errors
 * Preliminary support for Wordpress 3.0
 * Improved dates functions handling
 * PG4WP now appears in WordPress control panel and can be enabled/disabled but this has no real effect