diff --git a/sys/db/query_builder.php b/sys/db/query_builder.php
index 5942d56..f8435f6 100644
--- a/sys/db/query_builder.php
+++ b/sys/db/query_builder.php
@@ -137,6 +137,8 @@ class Query_Builder {
 
 		// Quote the identifiers
 		$safe_array = array_map(array($this->db, 'quote_ident'), $fields_array);
+		
+		unset($fields_array);
 
 		// Join the strings back together
 		for($i = 0, $c = count($safe_array); $i < $c; $i++)
@@ -149,7 +151,7 @@ class Query_Builder {
 
 		$this->select_string = implode(', ', $safe_array);
 		
-		//echo $this->select_string."<br />";
+		unset($safe_array);
 
 		return $this;
 	}
@@ -207,8 +209,10 @@ class Query_Builder {
 
 		// Create the where portion of the string
 		$this->where_string = ' WHERE '.implode(', ', $kv_array);
+		
+		unset($kv_array);
+		unset($fields);
 
-		// @todo Implement where method
 		return $this;
 	}
 	
diff --git a/tests/databases/firebird.php b/tests/databases/firebird.php
index e96b275..1fcfe4f 100644
--- a/tests/databases/firebird.php
+++ b/tests/databases/firebird.php
@@ -154,6 +154,21 @@ class FirebirdTest extends UnitTestCase {
 		$this->assertTrue(is_resource($query));
 	}
 	
+	function TestQBSelectWhereGet()
+	{
+		$query = $this->qb->select('id, key as k, val')->where('id >', 1)->get('create_test', 2, 1);
+
+		$this->assertTrue(is_resource($query));
+	}
+	
+	function TestQBSelectWhereGet2()
+	{
+		$query = $this->qb->select('id, key as k, val')->where(' id ', 1)->get('create_test', 2, 1);
+
+		$this->assertTrue(is_resource($query));
+	}
+
+	
 	function TestQBSelectGet()
 	{
 		$query = $this->qb->select('id, key as k, val')->get('create_test', 2, 1);
diff --git a/tests/databases/sqlite.php b/tests/databases/sqlite.php
index 5274e29..b82c0d4 100644
--- a/tests/databases/sqlite.php
+++ b/tests/databases/sqlite.php
@@ -154,7 +154,14 @@ SQL;
 
 	function TestQBSelectWhereGet()
 	{
-		$query = $this->qb->select('id, key as k, val')->where('id >', 1)->get('create_test, 2, 1');
+		$query = $this->qb->select('id, key as k, val')->where('id >', 1)->get('create_test', 2, 1);
+
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestQBSelectWhereGet2()
+	{
+		$query = $this->qb->select('id, key as k, val')->where('id', 1)->get('create_test', 2, 1);
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -179,7 +186,7 @@ SQL;
 
 		//Check
 		$dbs = $this->db->get_tables();
-		$this->assertTrue(empty($dbs['create_test']));
+		$this->assertFalse(in_array('create_test', $dbs));	
 	}
 
 }
\ No newline at end of file
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index 7dcb545..9499e06 100755
Binary files a/tests/test_dbs/FB_TEST_DB.FDB and b/tests/test_dbs/FB_TEST_DB.FDB differ