diff --git a/composer.json b/composer.json
index f4d1f04b..d4b5122d 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,7 @@
 		"nextcloud/coding-standard": "^0.4.0",
 		"christophwurst/nextcloud": "dev-master@dev",
 		"psalm/phar": "^4.22",
+		"bantu/ini-get-wrapper": "v1.0.1",
 		"phpunit/phpunit": "^9.5"
 	},
 	"scripts": {
diff --git a/composer.lock b/composer.lock
index 35065208..b3fc66bc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,45 +4,43 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "eb9d2ce7e9356c9321500e08bfc16f25",
-    "packages": [
+    "content-hash": "9cbe498b6f9c23f2761a96ab3e879849",
+    "packages": [],
+    "packages-dev": [
         {
-            "name": "psalm/phar",
-            "version": "4.22.0",
+            "name": "bantu/ini-get-wrapper",
+            "version": "v1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/psalm/phar.git",
-                "reference": "feebed09c9782d9aaa819b794d880c2671ba0e4c"
+                "url": "https://github.com/bantuXorg/php-ini-get-wrapper.git",
+                "reference": "4770c7feab370c62e23db4f31c112b7c6d90aee2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/psalm/phar/zipball/feebed09c9782d9aaa819b794d880c2671ba0e4c",
-                "reference": "feebed09c9782d9aaa819b794d880c2671ba0e4c",
+                "url": "https://api.github.com/repos/bantuXorg/php-ini-get-wrapper/zipball/4770c7feab370c62e23db4f31c112b7c6d90aee2",
+                "reference": "4770c7feab370c62e23db4f31c112b7c6d90aee2",
                 "shasum": ""
             },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "conflict": {
-                "vimeo/psalm": "*"
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*"
             },
-            "bin": [
-                "psalm.phar"
-            ],
             "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "bantu\\IniGetWrapper\\": "src/"
+                }
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "description": "Composer-based Psalm Phar",
+            "description": "Convenience wrapper around ini_get()",
             "support": {
-                "issues": "https://github.com/psalm/phar/issues",
-                "source": "https://github.com/psalm/phar/tree/4.22.0"
+                "issues": "https://github.com/bantuXorg/php-ini-get-wrapper/issues",
+                "source": "https://github.com/bantuXorg/php-ini-get-wrapper/tree/v1.0.1"
             },
-            "time": "2022-02-27T11:01:37+00:00"
-        }
-    ],
-    "packages-dev": [
+            "time": "2014-09-15T13:12:35+00:00"
+        },
         {
             "name": "christophwurst/nextcloud",
             "version": "dev-master",
@@ -1602,6 +1600,41 @@
             ],
             "time": "2022-03-15T09:57:31+00:00"
         },
+        {
+            "name": "psalm/phar",
+            "version": "4.22.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/psalm/phar.git",
+                "reference": "feebed09c9782d9aaa819b794d880c2671ba0e4c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/psalm/phar/zipball/feebed09c9782d9aaa819b794d880c2671ba0e4c",
+                "reference": "feebed09c9782d9aaa819b794d880c2671ba0e4c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "vimeo/psalm": "*"
+            },
+            "bin": [
+                "psalm.phar"
+            ],
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Composer-based Psalm Phar",
+            "support": {
+                "issues": "https://github.com/psalm/phar/issues",
+                "source": "https://github.com/psalm/phar/tree/4.22.0"
+            },
+            "time": "2022-02-27T11:01:37+00:00"
+        },
         {
             "name": "psr/cache",
             "version": "1.0.1",
@@ -4339,5 +4372,5 @@
     "platform-overrides": {
         "php": "7.4"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.1.0"
 }
diff --git a/lib/OperatingSystems/FreeBSD.php b/lib/OperatingSystems/FreeBSD.php
index 64f29f90..d46a40b1 100644
--- a/lib/OperatingSystems/FreeBSD.php
+++ b/lib/OperatingSystems/FreeBSD.php
@@ -26,11 +26,6 @@
 use OCA\ServerInfo\Resources\Disk;
 use OCA\ServerInfo\Resources\Memory;
 
-/**
- * Class FreeBSD
- *
- * @package OCA\ServerInfo\OperatingSystems
- */
 class FreeBSD implements IOperatingSystem {
 
 	public function supported(): bool {
@@ -81,7 +76,7 @@ public function getCpuName(): string {
 			$model = $this->executeCommand('/sbin/sysctl -n hw.model');
 			$cores = $this->executeCommand('/sbin/sysctl -n kern.smp.cpus');
 
-			if ($cores === 1) {
+			if ((int)$cores === 1) {
 				$data = $model . ' (1 core)';
 			} else {
 				$data = $model . ' (' . $cores . ' cores)';
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 83e59db9..64d1ff4f 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -28,19 +28,6 @@
       <code>$matches['Used'][$i]</code>
       <code>$matches['Used'][0]</code>
     </InvalidOperand>
-    <TypeDoesNotContainType occurrences="2">
-      <code>$cores === 1</code>
-      <code>$cores === 1</code>
-    </TypeDoesNotContainType>
-  </file>
-  <file src="lib/PhpStatistics.php">
-    <UndefinedClass occurrences="5">
-      <code>$this-&gt;phpIni</code>
-      <code>$this-&gt;phpIni</code>
-      <code>$this-&gt;phpIni</code>
-      <code>IniGetWrapper</code>
-      <code>IniGetWrapper</code>
-    </UndefinedClass>
   </file>
   <file src="lib/SystemStatistics.php">
     <RedundantCondition occurrences="1">
@@ -49,11 +36,8 @@
     <TypeDoesNotContainType occurrences="1">
       <code>$loadavg === false</code>
     </TypeDoesNotContainType>
-    <UndefinedClass occurrences="6">
+    <UndefinedClass occurrences="3">
       <code>$this-&gt;installer</code>
-      <code>$this-&gt;phpIni</code>
-      <code>IniGetWrapper</code>
-      <code>IniGetWrapper</code>
       <code>Installer</code>
       <code>Installer</code>
     </UndefinedClass>