diff --git a/app/Events/Load_config.php b/app/Events/Load_config.php
index e3649d75d..8e51d33e9 100644
--- a/app/Events/Load_config.php
+++ b/app/Events/Load_config.php
@@ -43,8 +43,8 @@ class Load_config
 
 		if(current_language_code() == null || current_language() == null || !$language_exists)	//TODO: current_language() is undefined
 		{
-			$config->language = 'english';
-			$config->language_code = 'en';
+			$config->settings['language'] = 'english';
+			$config->settings['language_code'] = 'en-US';
 		}
 
 		$language = Services::language();
diff --git a/app/Models/Sale.php b/app/Models/Sale.php
index 95f0f4fc7..8c8175a82 100644
--- a/app/Models/Sale.php
+++ b/app/Models/Sale.php
@@ -1103,11 +1103,10 @@ class Sale extends Model
 
 		$sale_cost = 'SUM(sales_items.item_cost_price * sales_items.quantity_purchased)';
 
-		$tax = 'IFnull(SUM(sales_items_taxes.tax), 0)';
-		$sales_tax = 'IFnull(SUM(sales_items_taxes.sales_tax), 0)';
-		$internal_tax = 'IFnull(SUM(sales_items_taxes.internal_tax), 0)';
-
-		$cash_adjustment = 'IFnull(SUM(payments.sale_cash_adjustment), 0)';
+		$tax = 'IFNULL(SUM(sales_items_taxes.tax), 0)';
+		$sales_tax = 'IFNULL(SUM(sales_items_taxes.sales_tax), 0)';
+		$internal_tax = 'IFNULL(SUM(sales_items_taxes.internal_tax), 0)';
+		$cash_adjustment = 'IFNULL(SUM(payments.sale_cash_adjustment), 0)';
 
 		if($config['tax_included'])
 		{