diff --git a/sys/common/db_pdo.php b/sys/common/db_pdo.php
index 0bcb850..a28f178 100644
--- a/sys/common/db_pdo.php
+++ b/sys/common/db_pdo.php
@@ -89,7 +89,7 @@ abstract class DB_PDO extends PDO {
 	 */
 	public function prepare_execute($sql, $params)
 	{	
-		$this->statement =& $this->prepare_query($sql, $params);
+		$this->statement = $this->prepare_query($sql, $params);
 		$this->statement->execute();
 
 		return $this->statement;
diff --git a/sys/databases/firebird.php b/sys/databases/firebird.php
index e8eed63..0aa4db2 100644
--- a/sys/databases/firebird.php
+++ b/sys/databases/firebird.php
@@ -30,7 +30,7 @@ class firebird extends DB_PDO {
 	 */
 	public function __construct($dbpath, $user='sysdba', $pass='masterkey')
 	{
-		$this->conn =& ibase_connect($dbpath, $user, $pass, 'utf-8');
+		$this->conn = ibase_connect($dbpath, $user, $pass, 'utf-8');
 		
 		$class = __CLASS__."_sql";
 		$this->sql = new $class;
@@ -73,7 +73,7 @@ class firebird extends DB_PDO {
 	public function query($sql)
 	{
 		$this->count = 0;
-		$this->statement =& ibase_query($this->conn, $sql);
+		$this->statement = ibase_query($this->conn, $sql);
 		return $this->statement;
 	}
 	
@@ -98,7 +98,7 @@ class firebird extends DB_PDO {
 			break;
 
 			default:
-				return ibase_fetch_assoc(&$this->statement, IBASE_FETCH_BLOBS);
+				return ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS);
 			break;
 		}
 	}
@@ -133,9 +133,9 @@ class firebird extends DB_PDO {
 	 * @param string $query
 	 * @return $this
 	 */
-	public function prepare($query)
+	public function prepare($query, $options=NULL)
 	{
-		$this->statement =& ibase_prepare($this->conn, $query);
+		$this->statement = ibase_prepare($this->conn, $query);
 		return $this->statement;
 	}
 	
@@ -154,7 +154,7 @@ class firebird extends DB_PDO {
 			AND "RDB\$RELATION_NAME" NOT LIKE 'MON$%'
 SQL;
 
-		$this->statement =& $this->query($sql);
+		$this->statement = $this->query($sql);
 		
 		$tables = array();
 		
@@ -181,7 +181,7 @@ SQL;
 			OR "RDB\$RELATION_NAME" LIKE 'MON$%';
 SQL;
 
-		$this->statement =& $this->query($sql);
+		$this->statement = $this->query($sql);
 
 		$tables = array();
 
@@ -200,7 +200,7 @@ SQL;
 	 * 
 	 * @return int
 	 */
-	public function affected_rows()
+	public function affected_rows($statement="")
 	{
 		return ibase_affected_rows($this->conn);
 	}
@@ -221,7 +221,7 @@ SQL;
 		}
 
 		//Fetch all the rows for the result
-		$this->result =& $this->fetchAll();
+		$this->result = $this->fetchAll();
 
 		return count($this->result);
 	}
@@ -312,7 +312,7 @@ SQL;
 	 * @param string $str
 	 * @return string
 	 */
-	public function quote($str)
+	public function quote($str, $param_type=NULL)
 	{
 		if(is_numeric($str))
 		{
diff --git a/tests/databases/sqlite.php b/tests/databases/sqlite.php
index 3e9fe89..4a8d92f 100644
--- a/tests/databases/sqlite.php
+++ b/tests/databases/sqlite.php
@@ -71,7 +71,7 @@ class SQLiteTest extends UnitTestCase {
 			INSERT INTO "create_test" ("id", "key", "val") 
 			VALUES (?,?,?)
 SQL;
-		$statement =& $this->db->prepare_query($sql, array(1,"boogers", "Gross"));
+		$statement = $this->db->prepare_query($sql, array(1,"boogers", "Gross"));
 		
 		$statement->execute();
 
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index 139e6fe..08ff3cb 100755
Binary files a/tests/test_dbs/FB_TEST_DB.FDB and b/tests/test_dbs/FB_TEST_DB.FDB differ