diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 38279ae..673d169 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -20,12 +20,10 @@
     </DeprecatedMethod>
   </file>
   <file src="src/Util/UuidFormatter.php">
-    <DeprecatedMethod occurrences="5">
+    <DeprecatedMethod occurrences="3">
       <code>getVariant</code>
       <code>getVariant</code>
       <code>getVersion</code>
-      <code>getVersion</code>
-      <code>getVersion</code>
     </DeprecatedMethod>
   </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
index e34ec83..7e1d747 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -4,6 +4,8 @@
        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
        errorLevel="1"
        findUnusedPsalmSuppress="true"
+       findUnusedBaselineEntry="true"
+       findUnusedCode="false"
        cacheDirectory="./build/cache/psalm"
        errorBaseline="psalm-baseline.xml">
 
diff --git a/src/Command/GenerateCommand.php b/src/Command/GenerateCommand.php
index 0037be8..03a0831 100644
--- a/src/Command/GenerateCommand.php
+++ b/src/Command/GenerateCommand.php
@@ -73,6 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $uuids = [];
 
+        /** @psalm-suppress RedundantFlag */
         $count = filter_var(
             $input->getOption('count'),
             FILTER_VALIDATE_INT,
diff --git a/src/Util/ErrorHandler.php b/src/Util/ErrorHandler.php
index c24a137..0b0c9c9 100644
--- a/src/Util/ErrorHandler.php
+++ b/src/Util/ErrorHandler.php
@@ -49,7 +49,7 @@ public static function handle(int $level, string $message, string $file, int $li
      */
     public static function register(): void
     {
-        /** @psalm-var callable(int, string, string, int):bool|null $callback */
+        /** @psalm-var callable(int, string, string=, int=, array<array-key, mixed>=):bool|null $callback */
         $callback = [self::class, 'handle'];
 
         set_error_handler($callback);