diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 6d3ef0b..f0ead71 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -86,9 +86,6 @@
     <InvalidReturnType>
       <code><![CDATA[ArrayIterator<int, T>]]></code>
     </InvalidReturnType>
-    <MixedArgument>
-      <code>$geometry</code>
-    </MixedArgument>
   </file>
   <file src="src/IO/EWKTParser.php">
     <InvalidClassConstantType>
diff --git a/src/GeometryCollection.php b/src/GeometryCollection.php
index f2a17d3..61ba5ed 100644
--- a/src/GeometryCollection.php
+++ b/src/GeometryCollection.php
@@ -73,7 +73,7 @@ public function __construct(CoordinateSystem $cs, Geometry ...$geometries)
                     '%s expects instance of %s, instance of %s given.',
                     static::class,
                     $containedGeometryType,
-                    get_class($geometry)
+                    $geometry::class
                 ));
             }
         }
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
index 2148a9a..80057de 100644
--- a/tests/AbstractTestCase.php
+++ b/tests/AbstractTestCase.php
@@ -361,7 +361,7 @@ final protected function expectExceptionIn(Closure $closure, string $exceptionCl
         try {
             $closure();
         } catch (Throwable $exception) {
-            if (get_class($exception) === $exceptionClass) {
+            if ($exception::class === $exceptionClass) {
                 $this->addtoAssertionCount(1);
                 return;
             }