diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
index b5edf37bf2f..b32b2ccb7c6 100644
--- a/apps/files_trashbin/lib/Trashbin.php
+++ b/apps/files_trashbin/lib/Trashbin.php
@@ -850,7 +850,7 @@ class Trashbin implements IEventListener {
 
 		$softQuota = true;
 		$quota = $user->getQuota();
-		if ($quota === null || $quota === 'none') {
+		if ($quota === 'none') {
 			$quota = Filesystem::free_space('/');
 			$softQuota = false;
 			// inf or unknown free space
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index 47f14d96b61..cf49e5a1d4d 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -879,7 +879,7 @@ class Storage {
 
 			$softQuota = true;
 			$quota = $user->getQuota();
-			if ($quota === null || $quota === 'none') {
+			if ($quota === 'none') {
 				$quota = Filesystem::free_space('/');
 				$softQuota = false;
 			} else {
diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php
index b251610e67f..3cda3ae74ba 100644
--- a/apps/provisioning_api/lib/Controller/GroupsController.php
+++ b/apps/provisioning_api/lib/Controller/GroupsController.php
@@ -216,7 +216,7 @@ class GroupsController extends AUserDataOCSController {
 			foreach ($users as $user) {
 				try {
 					/** @var IUser $user */
-					$userId = (string)$user->getUID();
+					$userId = $user->getUID();
 					$userData = $this->getUserData($userId);
 					// Do not insert empty entry
 					if ($userData !== null) {
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
index 3bc0580be36..3cc86922dad 100644
--- a/apps/user_ldap/lib/Connection.php
+++ b/apps/user_ldap/lib/Connection.php
@@ -313,7 +313,7 @@ class Connection extends LDAPUtility {
 		$key = $this->getCacheKey($key);
 		$value = base64_encode(json_encode($value));
 		$ttl = $ttlOverride ?? $this->configuration->ldapCacheTTL;
-		$this->cache->set($key, $value, $ttl);
+		$this->cache->set($key, $value, (int)$ttl);
 	}
 
 	public function clearCache() {
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index fe478aab69d..ca0d4b6785c 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -3417,6 +3417,7 @@
       <code><![CDATA[getPassword]]></code>
       <code><![CDATA[getRemember]]></code>
       <code><![CDATA[getScope]]></code>
+      <code><![CDATA[getToken]]></code>
       <code><![CDATA[setExpires]]></code>
       <code><![CDATA[setLastCheck]]></code>
       <code><![CDATA[setName]]></code>
diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php
index 415a38ef418..4dddfb3ed37 100644
--- a/lib/private/Group/Manager.php
+++ b/lib/private/Group/Manager.php
@@ -452,7 +452,7 @@ class Manager extends PublicEmitter implements IGroupManager {
 
 		$matchingUsers = [];
 		foreach ($groupUsers as $groupUser) {
-			$matchingUsers[(string)$groupUser->getUID()] = $groupUser->getDisplayName();
+			$matchingUsers[$groupUser->getUID()] = $groupUser->getDisplayName();
 		}
 		return $matchingUsers;
 	}
diff --git a/lib/private/User/LazyUser.php b/lib/private/User/LazyUser.php
index 25ea950bf85..8a010782a03 100644
--- a/lib/private/User/LazyUser.php
+++ b/lib/private/User/LazyUser.php
@@ -148,7 +148,7 @@ class LazyUser implements IUser {
 	}
 
 	#[\Override]
-	public function getEMailAddress(): string {
+	public function getEMailAddress(): ?string {
 		return $this->getUser()->getEMailAddress();
 	}