diff --git a/system/src/Grav/Common/Media/Interfaces/ImageManipulateInterface.php b/system/src/Grav/Common/Media/Interfaces/ImageManipulateInterface.php
index eb38ea83b..dec252849 100644
--- a/system/src/Grav/Common/Media/Interfaces/ImageManipulateInterface.php
+++ b/system/src/Grav/Common/Media/Interfaces/ImageManipulateInterface.php
@@ -18,6 +18,7 @@ interface ImageManipulateInterface
      * Allows the ability to override the image's pretty name stored in cache
      *
      * @param string $name
+     * @return void
      */
     public function setImagePrettyName($name);
 
@@ -47,6 +48,8 @@ interface ImageManipulateInterface
 
     /**
      * Clear out the alternatives.
+     *
+     * @return void
      */
     public function clearAlternatives();
 
diff --git a/system/src/Grav/Common/Media/Interfaces/MediaObjectInterface.php b/system/src/Grav/Common/Media/Interfaces/MediaObjectInterface.php
index 7ce5eda47..9506ff508 100644
--- a/system/src/Grav/Common/Media/Interfaces/MediaObjectInterface.php
+++ b/system/src/Grav/Common/Media/Interfaces/MediaObjectInterface.php
@@ -18,6 +18,8 @@ use Grav\Common\Data\Data;
  * @property string $type
  * @property string $filename
  * @property string $filepath
+ *
+ * @extends ArrayAccess<string,mixed>
  */
 interface MediaObjectInterface extends \Grav\Framework\Media\Interfaces\MediaObjectInterface, ArrayAccess
 {
@@ -54,6 +56,7 @@ interface MediaObjectInterface extends \Grav\Framework\Media\Interfaces\MediaObj
      * Add meta file for the medium.
      *
      * @param string $filepath
+     * @return void
      */
     public function addMetaFile($filepath);
 
@@ -62,6 +65,7 @@ interface MediaObjectInterface extends \Grav\Framework\Media\Interfaces\MediaObj
      *
      * @param int|float $ratio
      * @param MediaObjectInterface $alternative
+     * @return void
      */
     public function addAlternative($ratio, MediaObjectInterface $alternative);
 
diff --git a/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php b/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php
index 3d16ac1c9..2d3a4ba24 100644
--- a/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php
+++ b/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php
@@ -96,6 +96,7 @@ trait ImageMediaTrait
      * Allows the ability to override the image's pretty name stored in cache
      *
      * @param string $name
+     * @return void
      */
     public function setImagePrettyName($name)
     {
@@ -212,6 +213,8 @@ trait ImageMediaTrait
 
     /**
      * Clear out the alternatives.
+     *
+     * @return void
      */
     public function clearAlternatives()
     {
diff --git a/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php b/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php
index e2bb71cd4..e4578f8c3 100644
--- a/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php
+++ b/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php
@@ -104,6 +104,7 @@ trait MediaObjectTrait
      * Add meta file for the medium.
      *
      * @param string $filepath
+     * @return void
      */
     abstract public function addMetaFile($filepath);
 
@@ -112,6 +113,7 @@ trait MediaObjectTrait
      *
      * @param int|float $ratio
      * @param MediaObjectInterface $alternative
+     * @return void
      */
     public function addAlternative($ratio, MediaObjectInterface $alternative)
     {
diff --git a/system/src/Grav/Common/Media/Traits/MediaPlayerTrait.php b/system/src/Grav/Common/Media/Traits/MediaPlayerTrait.php
index 06cb99ad9..a67b3b453 100644
--- a/system/src/Grav/Common/Media/Traits/MediaPlayerTrait.php
+++ b/system/src/Grav/Common/Media/Traits/MediaPlayerTrait.php
@@ -105,6 +105,8 @@ trait MediaPlayerTrait
 
     /**
      * Reset player.
+     *
+     * @return void
      */
     public function resetPlayer()
     {
diff --git a/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php b/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php
index 9639b3eca..3ce7f144f 100644
--- a/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php
+++ b/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php
@@ -310,7 +310,7 @@ trait MediaUploadTrait
 
             // Force media index update.
             if (method_exists($this, 'saveIndex')) {
-                $this->saveIndex($this->index, 0);
+                $this->saveIndex($this->index);
             }
 
         } catch (Exception $e) {
@@ -362,7 +362,7 @@ trait MediaUploadTrait
 
         // Force media index update.
         if (method_exists($this, 'saveIndex')) {
-            $this->saveIndex($this->index, 0);
+            $this->saveIndex($this->index);
         }
 
         // Finally clear media cache.
@@ -407,7 +407,7 @@ trait MediaUploadTrait
 
         // Force media index update.
         if (method_exists($this, 'saveIndex')) {
-            $this->saveIndex($this->index, 0);
+            $this->saveIndex($this->index);
         }
 
         // Finally clear media cache.
diff --git a/system/src/Grav/Common/Page/Medium/AbstractMedia.php b/system/src/Grav/Common/Page/Medium/AbstractMedia.php
index 962cb8561..dbb439234 100644
--- a/system/src/Grav/Common/Page/Medium/AbstractMedia.php
+++ b/system/src/Grav/Common/Page/Medium/AbstractMedia.php
@@ -157,7 +157,7 @@ abstract class AbstractMedia implements ExportInterface, MediaCollectionInterfac
     public function offsetUnset($offset): void
     {
         // Hack to make Iterator trait work together with unset.
-        if (isset($this->iteratorUnset) && (string)$offset === (string)key($this->items)) {
+        if ((string)$offset === (string)key($this->items)) {
             $this->iteratorUnset = true;
         }
 
@@ -650,7 +650,7 @@ abstract class AbstractMedia implements ExportInterface, MediaCollectionInterfac
                 $oldChecksum = $data['checksum'] ?? null;
                 $newChecksum = md5(serialize($files));
                 if ($oldChecksum !== $newChecksum) {
-                    $this->saveIndex($files, $now);
+                    $this->saveIndex($files, $newChecksum, $now);
                 } else {
                     $this->touchIndex($now);
                 }
@@ -735,8 +735,8 @@ abstract class AbstractMedia implements ExportInterface, MediaCollectionInterfac
             if (file_exists($meta_path)) {
                 $types['meta']['file'] = $meta_path;
             } elseif ($exifReader = $this->getExifReader()) {
-                $meta = $exifReader->read($file_path);
-                if ($meta) {
+                try {
+                    $meta = $exifReader->read($file_path);
                     $meta_data = $meta->getData();
                     $meta_trimmed = array_diff_key($meta_data, array_flip($this->standard_exif));
                     if ($meta_trimmed) {
@@ -749,6 +749,7 @@ abstract class AbstractMedia implements ExportInterface, MediaCollectionInterfac
                         $file->save($meta_trimmed);
                         $types['meta']['file'] = $meta_path;
                     }
+                } catch (RuntimeException $e) {
                 }
             }
         }
@@ -779,7 +780,7 @@ abstract class AbstractMedia implements ExportInterface, MediaCollectionInterfac
                     $altWidth = $altMedium['file']->get('width');
                     $medWidth = $medium->get('width');
                     if ($altWidth && $medWidth) {
-                        $ratio = (string)($altWidth / $medWidth);
+                        $ratio = $altWidth / $medWidth;
                         $medium->addAlternative($ratio, $altMedium['file']);
                     }
                 }
@@ -841,10 +842,11 @@ abstract class AbstractMedia implements ExportInterface, MediaCollectionInterfac
 
     /**
      * @param array $files
+     * @param string|null $checksum
      * @param int|null $timestamp
      * @return void
      */
-    protected function saveIndex(array $files, string $checksum, ?int $timestamp = null): void
+    protected function saveIndex(array $files, string $checksum = null, ?int $timestamp = null): void
     {
         $index = $this->getIndexFile();
         if (!$index || !$this->exists) {
@@ -854,7 +856,7 @@ abstract class AbstractMedia implements ExportInterface, MediaCollectionInterfac
         $data = [
             'type' => $this->config['type'] ?? 'local',
             'version' => static::VERSION,
-            'checksum' => $checksum,
+            'checksum' => $checksum ?? md5(serialize($files)),
             'timestamp' => $timestamp ?? time(),
             'folder' => $this->path,
             'url' => $this->url,
diff --git a/system/src/Grav/Common/Page/Medium/ImageFile.php b/system/src/Grav/Common/Page/Medium/ImageFile.php
index e38c07caf..d6da3bca0 100644
--- a/system/src/Grav/Common/Page/Medium/ImageFile.php
+++ b/system/src/Grav/Common/Page/Medium/ImageFile.php
@@ -171,6 +171,8 @@ class ImageFile extends Image
 
     /**
      * Read exif rotation from file and apply it.
+     *
+     * @return $this
      */
     public function fixOrientation()
     {
diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php
index 28ca103fc..8d1455202 100644
--- a/system/src/Grav/Common/Page/Medium/ImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php
@@ -202,7 +202,9 @@ class ImageMedium extends Medium implements ImageMediaInterface, ImageManipulate
 
         $srcset = $this->srcset($reset);
         if ($srcset) {
-            empty($attributes['srcset']) && $attributes['srcset'] = $srcset;
+            if (empty($attributes['srcset'])) {
+                $attributes['srcset'] = $srcset;
+            }
             $attributes['sizes'] = $this->sizes();
         }
 
diff --git a/system/src/Grav/Common/Page/Medium/LocalMedia.php b/system/src/Grav/Common/Page/Medium/LocalMedia.php
index bbe5255fa..173c61866 100644
--- a/system/src/Grav/Common/Page/Medium/LocalMedia.php
+++ b/system/src/Grav/Common/Page/Medium/LocalMedia.php
@@ -187,10 +187,10 @@ abstract class LocalMedia extends AbstractMedia
         // Add missing jpeg exif data.
         $exifReader = $this->getExifReader();
         if (null !== $exifReader && !isset($info['exif']) && $info['mime'] === 'image/jpeg') {
+        try {
             $exif = $exifReader->read($filepath);
-            if ($exif) {
-                $info['exif'] = array_diff_key($exif->getData(), array_flip($this->standard_exif));
-            }
+            $info['exif'] = array_diff_key($exif->getData(), array_flip($this->standard_exif));
+        } catch (\RuntimeException $e) {
         }
         */
 
diff --git a/system/src/Grav/Common/Page/Medium/Medium.php b/system/src/Grav/Common/Page/Medium/Medium.php
index b1ee11553..6fe2538d6 100644
--- a/system/src/Grav/Common/Page/Medium/Medium.php
+++ b/system/src/Grav/Common/Page/Medium/Medium.php
@@ -98,6 +98,7 @@ class Medium extends Data implements RenderableInterface, MediaFileInterface
      * Add meta file for the medium.
      *
      * @param string $filepath
+     * @return void
      */
     public function addMetaFile($filepath)
     {