diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index e18201420..b9936850c 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -10,6 +10,7 @@
 namespace Grav\Common\Page;
 
 use FilesystemIterator;
+use Grav\Common\Config\Config;
 use Grav\Common\Grav;
 use Grav\Common\Media\Interfaces\MediaObjectInterface;
 use Grav\Common\Yaml;
@@ -86,11 +87,6 @@ class Media extends AbstractMedia
      */
     protected function init()
     {
-        /** @var UniformResourceLocator $locator */
-        $locator = Grav::instance()['locator'];
-        $config = Grav::instance()['config'];
-        $exif_reader = isset(Grav::instance()['exif']) ? Grav::instance()['exif']->getReader() : false;
-        $media_types = array_keys(Grav::instance()['config']->get('media.types'));
         $path = $this->getPath();
 
         // Handle special cases where page doesn't exist in filesystem.
@@ -98,6 +94,17 @@ class Media extends AbstractMedia
             return;
         }
 
+        $grav = Grav::instance();
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $grav['locator'];
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        $exif_reader = isset($grav['exif']) ? $grav['exif']->getReader() : null;
+        $media_types = array_keys($config->get('media.types', []));
+
         $iterator = new FilesystemIterator($path, FilesystemIterator::UNIX_PATHS | FilesystemIterator::SKIP_DOTS);
 
         $media = [];
diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php
index 6d1e9043d..7bb5b46c2 100644
--- a/system/src/Grav/Common/Page/Medium/ImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php
@@ -249,12 +249,12 @@ class ImageMedium extends Medium implements ImageMediaInterface, ImageManipulate
         if ($this->saved_image_path && $this->auto_sizes) {
             if (!array_key_exists('height', $this->attributes) && !array_key_exists('width', $this->attributes)) {
                 $info = getimagesize($this->saved_image_path);
-                $width = intval($info[0]);
-                $height = intval($info[1]);
+                $width = (int)$info[0];
+                $height = (int)$info[1];
 
                 $scaling_factor = $this->retina_scale > 0 ? $this->retina_scale : 1;
-                $attributes['width'] = intval($width / $scaling_factor);
-                $attributes['height'] = intval($height / $scaling_factor);
+                $attributes['width'] = (int)($width / $scaling_factor);
+                $attributes['height'] = (int)($height / $scaling_factor);
 
                 if ($this->aspect_ratio) {
                     $style = ($attributes['style'] ?? ' ') . "--aspect-ratio: $width/$height;";