diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index 105df50ec9ba..94ba71086a22 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -42,6 +42,7 @@ class QueryLogging
         $timeStart = microtime(true);
         DB::enableQueryLog();
 
+        $response = $next($request);
         // hide requests made by debugbar
         if (strstr($request->url(), '_debugbar') === false) {
 
@@ -71,7 +72,6 @@ class QueryLogging
                  ->queue();
         }
         
-
-        return $next($request);
+        return $response;
     }
 }
diff --git a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
index 0d075f26eaa7..79d9c77bd275 100644
--- a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
+++ b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
@@ -29,6 +29,10 @@ trait CompanyGatewayFeesAndLimitsSaver
 
             foreach ($casts as $key => $value) {
 
+                if($value == 'float' && property_exists($fee_and_limit, $key)){
+                    $fee_and_limit->{$key} = floatval($fee_and_limit->{$key});
+                }
+
                 /* Handles unset settings or blank strings */
                 if (! property_exists($fee_and_limit, $key) || is_null($fee_and_limit->{$key}) || ! isset($fee_and_limit->{$key}) || $fee_and_limit->{$key} == '') {
                     continue;
diff --git a/app/Utils/Traits/SettingsSaver.php b/app/Utils/Traits/SettingsSaver.php
index 5237afbf32e1..fbcc7d44e1ad 100644
--- a/app/Utils/Traits/SettingsSaver.php
+++ b/app/Utils/Traits/SettingsSaver.php
@@ -35,6 +35,12 @@ trait SettingsSaver
         ksort($casts);
 
         foreach ($casts as $key => $value) {
+            
+            //try casting floats here
+            if($value == 'float' && property_exists($settings, $key)){
+                $settings->{$key} = floatval($settings->{$key});
+            }
+
             if (in_array($key, CompanySettings::$string_casts)) {
                 $value = 'string';
                 if (! property_exists($settings, $key)) {