diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 6d5196d536c3..32b0b398a02a 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -624,7 +624,7 @@ class BaseController extends Controller
 
         // 10-01-2022 need to ensure we snake case properly here to ensure permissions work as expected
         // if (auth()->user() && ! auth()->user()->hasPermission('view_'.lcfirst(class_basename($this->entity_type)))) {
-        if (auth()->user() && ! auth()->user()->hasPermission('view_'.lcfirst(class_basename(Str::snake($this->entity_type))))) {
+        if (auth()->user() && ! auth()->user()->hasPermission('view'.lcfirst(class_basename(Str::snake($this->entity_type))))) {
             $query->where('user_id', '=', auth()->user()->id);
         }
 
diff --git a/app/Models/User.php b/app/Models/User.php
index d47de44c3401..bf2195fb372e 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -156,8 +156,6 @@ class User extends Authenticatable implements MustVerifyEmail
             return CompanyToken::with(['cu'])->where('token', request()->header('X-API-TOKEN'))->first();
         }
 
-        if($truth->getCompany())
-            return $this->tokens()->where('company_id', $truth->getCompany()->id)->first();
 
         return $this->tokens()->first();
     }
diff --git a/app/Utils/Traits/ClientGroupSettingsSaver.php b/app/Utils/Traits/ClientGroupSettingsSaver.php
index 8ed5856a5586..c4cce0e598dd 100644
--- a/app/Utils/Traits/ClientGroupSettingsSaver.php
+++ b/app/Utils/Traits/ClientGroupSettingsSaver.php
@@ -212,7 +212,8 @@ trait ClientGroupSettingsSaver
             case 'real':
             case 'float':
             case 'double':
-                return is_float($value) || is_numeric(strval($value));
+                return !is_string($value) && (is_float($value) || is_numeric(strval($value)));
+                //return is_float($value) || is_numeric(strval($value));
             case 'string':
                 return ( is_string( $value ) && method_exists($value, '__toString') ) || is_null($value) || is_string($value);
             case 'bool':
diff --git a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
index 26c4e5d1b5d9..0d075f26eaa7 100644
--- a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
+++ b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
@@ -59,7 +59,8 @@ trait CompanyGatewayFeesAndLimitsSaver
             case 'real':
             case 'float':
             case 'double':
-                return is_float($value) || is_numeric(strval($value));
+               return !is_string($value) && (is_float($value) || is_numeric(strval($value)));
+           //     return is_float($value) || is_numeric(strval($value));
             case 'string':
                 return ( is_string( $value ) && method_exists($value, '__toString') ) || is_null($value) || is_string($value);
             case 'bool':
diff --git a/app/Utils/Traits/CompanySettingsSaver.php b/app/Utils/Traits/CompanySettingsSaver.php
index cd2534d6ce57..1653df5a4a23 100644
--- a/app/Utils/Traits/CompanySettingsSaver.php
+++ b/app/Utils/Traits/CompanySettingsSaver.php
@@ -229,7 +229,8 @@ trait CompanySettingsSaver
             case 'real':
             case 'float':
             case 'double':
-                return is_float($value) || is_numeric(strval($value));
+                return !is_string($value) && (is_float($value) || is_numeric(strval($value)));
+//                return is_float($value) || is_numeric(strval($value));
             case 'string':
                 return (is_string($value) && method_exists($value, '__toString')) || is_null($value) || is_string($value);
             case 'bool':
diff --git a/app/Utils/Traits/SettingsSaver.php b/app/Utils/Traits/SettingsSaver.php
index 0699c04325cf..5237afbf32e1 100644
--- a/app/Utils/Traits/SettingsSaver.php
+++ b/app/Utils/Traits/SettingsSaver.php
@@ -92,7 +92,8 @@ trait SettingsSaver
             case 'real':
             case 'float':
             case 'double':
-                return is_float($value) || is_numeric(strval($value));
+                return !is_string($value) && (is_float($value) || is_numeric(strval($value)));
+                // return is_float($value) || is_numeric(strval($value));
             case 'string':
                 return !is_int($value) || ( is_string( $value ) && method_exists($value, '__toString') ) || is_null($value) || is_string($value);
             case 'bool':