diff --git a/classes/query_builder.php b/classes/query_builder.php
index dc11f60..8e1b866 100644
--- a/classes/query_builder.php
+++ b/classes/query_builder.php
@@ -1242,7 +1242,8 @@ class Query_Builder implements Query_Builder_Interface {
 	 */
 	public function reset_query()
 	{
-		$null_properties = array(
+		// Reset strings and booleans
+		foreach(array(
 			'select_string',
 			'from_string',
 			'set_string',
@@ -1251,9 +1252,13 @@ class Query_Builder implements Query_Builder_Interface {
 			'limit',
 			'offset',
 			'explain'
-		);
+		) as $var)
+		{
+			$this->$var = NULL;
+		}
 
-		$array_properties = array(
+		// Reset arrays
+		foreach(array(
 			'set_array_keys',
 			'order_array',
 			'group_array',
@@ -1261,16 +1266,7 @@ class Query_Builder implements Query_Builder_Interface {
 			'where_values',
 			'query_map',
 			'having_map'
-		);
-
-		// Reset strings and booleans
-		foreach($null_properties as $var)
-		{
-			$this->$var = NULL;
-		}
-
-		// Reset arrays
-		foreach($array_properties as $var)
+		) as $var)
 		{
 			$this->$var = array();
 		}
diff --git a/drivers/firebird/firebird_driver.php b/drivers/firebird/firebird_driver.php
index dfb4a1b..f7d71c3 100644
--- a/drivers/firebird/firebird_driver.php
+++ b/drivers/firebird/firebird_driver.php
@@ -77,11 +77,13 @@ class Firebird extends Abstract_Driver {
 		// of DB_PDO, which defines these two
 		// class variables for the other drivers
 
-		foreach(array('sql', 'util') as $sub)
-		{
-			$class = __CLASS__ . "_{$sub}";
-			$this->$sub = new $class($this);
-		}
+		// Load the sql class
+		$class = __CLASS__."_sql";
+		$this->sql = new $class();
+
+		// Load the util class
+		$class = __CLASS__."_util";
+		$this->util = new $class($this);
 	}
 
 	// --------------------------------------------------------------------------