diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
index 4a74e2d9d..4e1d192e0 100644
--- a/lib/Activity/ActivityManager.php
+++ b/lib/Activity/ActivityManager.php
@@ -325,7 +325,6 @@ class ActivityManager {
 		 */
 		$eventType = 'deck';
 		$subjectParams = [];
-		$message = null;
 		switch ($subject) {
 			// No need to enhance parameters since entity already contains the required data
 			case self::SUBJECT_BOARD_CREATE:
@@ -434,10 +433,6 @@ class ActivityManager {
 			->setSubject($subject, $subjectParams)
 			->setTimestamp(time());
 
-		if ($message !== null) {
-			$event->setMessage($message);
-		}
-
 		// FIXME: We currently require activities for comments even if they are disabled though settings
 		// Get rid of this once the frontend fetches comments/activity individually
 		if ($eventType === 'deck_comment') {
diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php
index a2a5c9d8c..d19bcc72b 100644
--- a/lib/Activity/DeckProvider.php
+++ b/lib/Activity/DeckProvider.php
@@ -294,7 +294,7 @@ class DeckProvider implements IProvider {
 		if (array_key_exists('comment', $subjectParams)) {
 			/** @var IComment $comment */
 			try {
-				$comment = $this->commentsManager->get((int)$subjectParams['comment']);
+				$comment = $this->commentsManager->get($subjectParams['comment']);
 				$event->setParsedMessage($comment->getMessage());
 				$params['comment'] = [
 					'type' => 'highlight',
diff --git a/lib/Db/AclMapper.php b/lib/Db/AclMapper.php
index c271d8d32..cac999d4d 100644
--- a/lib/Db/AclMapper.php
+++ b/lib/Db/AclMapper.php
@@ -28,6 +28,7 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
+/** @template-extends DeckMapper<Acl> */
 class AclMapper extends DeckMapper implements IPermissionMapper {
 	public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'deck_board_acl', Acl::class);
diff --git a/lib/Db/AssignmentMapper.php b/lib/Db/AssignmentMapper.php
index 65fa2ba8d..d7d3a1eb8 100644
--- a/lib/Db/AssignmentMapper.php
+++ b/lib/Db/AssignmentMapper.php
@@ -35,6 +35,7 @@ use OCP\IGroupManager;
 use OCP\IUserManager;
 use PDO;
 
+/** @template-extends QBMapper<Assignment> */
 class AssignmentMapper extends QBMapper implements IPermissionMapper {
 
 	/** @var CardMapper */
diff --git a/lib/Db/AttachmentMapper.php b/lib/Db/AttachmentMapper.php
index 727e3cce1..c35f49fcf 100644
--- a/lib/Db/AttachmentMapper.php
+++ b/lib/Db/AttachmentMapper.php
@@ -31,6 +31,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUserManager;
 
+/** @template-extends DeckMapper<Attachment> */
 class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	private $cardMapper;
 	private $userManager;
diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php
index c340aa151..5db3c3994 100644
--- a/lib/Db/BoardMapper.php
+++ b/lib/Db/BoardMapper.php
@@ -33,6 +33,7 @@ use OCP\IUserManager;
 use OCP\IGroupManager;
 use Psr\Log\LoggerInterface;
 
+/** @template-extends QBMapper<Board> */
 class BoardMapper extends QBMapper implements IPermissionMapper {
 	private $labelMapper;
 	private $aclMapper;
diff --git a/lib/Db/CardMapper.php b/lib/Db/CardMapper.php
index e245c0320..d1b70c600 100644
--- a/lib/Db/CardMapper.php
+++ b/lib/Db/CardMapper.php
@@ -38,6 +38,7 @@ use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Notification\IManager;
 
+/** @template-extends QBMapper<Card> */
 class CardMapper extends QBMapper implements IPermissionMapper {
 
 	/** @var LabelMapper */
diff --git a/lib/Db/DeckMapper.php b/lib/Db/DeckMapper.php
index 0aa0e7d96..887774409 100644
--- a/lib/Db/DeckMapper.php
+++ b/lib/Db/DeckMapper.php
@@ -23,15 +23,15 @@
 
 namespace OCA\Deck\Db;
 
+use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
 /**
- * Class DeckMapper
- *
- * @package OCA\Deck\Db
+ * @template T of Entity
+ * @template-extends QBMapper<T>
  */
-class DeckMapper extends QBMapper {
+abstract class DeckMapper extends QBMapper {
 
 	/**
 	 * @param $id
diff --git a/lib/Db/LabelMapper.php b/lib/Db/LabelMapper.php
index 61ce03ed3..7f6de33bf 100644
--- a/lib/Db/LabelMapper.php
+++ b/lib/Db/LabelMapper.php
@@ -29,6 +29,7 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
+/** @template-extends DeckMapper<Label> */
 class LabelMapper extends DeckMapper implements IPermissionMapper {
 	public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'deck_labels', Label::class);
@@ -51,11 +52,6 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
-	/**
-	 * @param Entity $entity
-	 * @return Entity
-	 * @throws \OCP\DB\Exception
-	 */
 	public function delete(Entity $entity): Entity {
 		// delete assigned labels
 		$this->deleteLabelAssignments($entity->getId());
@@ -105,23 +101,12 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
-	/**
-	 * @param Entity $entity
-	 * @return Entity
-	 * @throws \OCP\DB\Exception
-	 */
 	public function insert(Entity $entity): Entity {
 		$entity->setLastModified(time());
 		return parent::insert($entity);
 	}
 
-	/**
-	 * @param Entity $entity
-	 * @param bool $updateModified
-	 * @return Entity
-	 * @throws \OCP\DB\Exception
-	 */
-	public function update(Entity $entity, $updateModified = true): Entity {
+	public function update(Entity $entity, bool $updateModified = true): Entity {
 		if ($updateModified) {
 			$entity->setLastModified(time());
 		}
diff --git a/lib/Db/StackMapper.php b/lib/Db/StackMapper.php
index 819919e32..7403b6426 100644
--- a/lib/Db/StackMapper.php
+++ b/lib/Db/StackMapper.php
@@ -29,6 +29,7 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
+/** @template-extends DeckMapper<Stack> */
 class StackMapper extends DeckMapper implements IPermissionMapper {
 	private $cardMapper;
 
@@ -112,11 +113,6 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
-	/**
-	 * @param Entity $entity
-	 * @return Entity
-	 * @throws \OCP\DB\Exception
-	 */
 	public function delete(Entity $entity): Entity {
 		// delete cards on stack
 		$this->cardMapper->deleteByStack($entity->getId());
diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php
index 9e0c5e6f6..9aaae45c5 100644
--- a/lib/Listeners/BeforeTemplateRenderedListener.php
+++ b/lib/Listeners/BeforeTemplateRenderedListener.php
@@ -32,6 +32,7 @@ use OCP\EventDispatcher\IEventListener;
 use OCP\IRequest;
 use OCP\Util;
 
+/** @template-implements IEventListener<Event|BeforeTemplateRenderedEvent> */
 class BeforeTemplateRenderedListener implements IEventListener {
 	private $request;
 
diff --git a/lib/Listeners/FullTextSearchEventListener.php b/lib/Listeners/FullTextSearchEventListener.php
index 954ae72db..15df582a7 100644
--- a/lib/Listeners/FullTextSearchEventListener.php
+++ b/lib/Listeners/FullTextSearchEventListener.php
@@ -42,8 +42,9 @@ use OCP\FullTextSearch\Model\IIndex;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
+/** @template-implements IEventListener<Event|ACardEvent|AAclEvent> */
 class FullTextSearchEventListener implements IEventListener {
-	
+
 	/** @var string|null */
 	private $userId;
 	/** @var IFullTextSearchManager|null */
@@ -52,7 +53,7 @@ class FullTextSearchEventListener implements IEventListener {
 	private $service;
 	/** @var LoggerInterface */
 	private $logger;
-	
+
 	public function __construct(ContainerInterface $container, $userId) {
 		$this->userId = $userId;
 		$this->logger = $container->get(LoggerInterface::class);
@@ -68,7 +69,7 @@ class FullTextSearchEventListener implements IEventListener {
 		if (!$event instanceof ACardEvent && !$event instanceof AAclEvent) {
 			return;
 		}
-		
+
 		try {
 			if ($event instanceof CardCreatedEvent) {
 				$this->manager->createIndex(
diff --git a/lib/Listeners/ParticipantCleanupListener.php b/lib/Listeners/ParticipantCleanupListener.php
index aa159107d..c466ea70a 100644
--- a/lib/Listeners/ParticipantCleanupListener.php
+++ b/lib/Listeners/ParticipantCleanupListener.php
@@ -12,6 +12,7 @@ use OCP\EventDispatcher\IEventListener;
 use OCP\Group\Events\GroupDeletedEvent;
 use OCP\User\Events\UserDeletedEvent;
 
+/** @template-implements IEventListener<Event|UserDeletedEvent|GroupDeletedEvent|CircleDestroyedEvent> */
 class ParticipantCleanupListener implements IEventListener {
 	private AclMapper $aclMapper;
 	private AssignmentMapper $assignmentMapper;
diff --git a/lib/Listeners/ResourceListener.php b/lib/Listeners/ResourceListener.php
index 08045dff8..735ff7294 100644
--- a/lib/Listeners/ResourceListener.php
+++ b/lib/Listeners/ResourceListener.php
@@ -11,6 +11,7 @@ use OCP\Collaboration\Resources\ResourceException;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<Event|AclDeletedEvent|AclCreatedEvent> */
 class ResourceListener implements IEventListener {
 
 	/** @var IManager */
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 3bde7e22a..c9c7d7714 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
-  <file src="lib/Activity/ActivityManager.php">
-    <TypeDoesNotContainType occurrences="1">
-      <code>$message !== null</code>
-    </TypeDoesNotContainType>
-  </file>
-  <file src="lib/Activity/DeckProvider.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>(int)$subjectParams['comment']</code>
-    </InvalidScalarArgument>
-  </file>
+<files psalm-version="5.4.0@62db5d4f6a7ae0a20f7cc5a4952d730272fc0863">
   <file src="lib/Activity/Filter.php">
     <MethodSignatureMismatch occurrences="1">
       <code>$types</code>
@@ -111,11 +101,6 @@
       <code>VCalendar</code>
     </UndefinedClass>
   </file>
-  <file src="lib/Migration/Version10800Date20220422061816.php">
-    <MoreSpecificImplementedParamType occurrences="1">
-      <code>$schemaClosure</code>
-    </MoreSpecificImplementedParamType>
-  </file>
   <file src="lib/Service/AttachmentService.php">
     <InvalidCatch occurrences="1"/>
   </file>
@@ -136,6 +121,11 @@
       <code>is_resource($content)</code>
     </RedundantCondition>
   </file>
+  <file src="lib/Sharing/DeckShareProvider.php">
+    <InvalidReturnType occurrences="1">
+      <code>getShareByToken</code>
+    </InvalidReturnType>
+  </file>
   <file src="lib/Sharing/Listener.php">
     <InvalidArgument occurrences="1">
       <code>[self::class, 'listenPreShare']</code>