diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml
index 55d06e72d..c880fb674 100644
--- a/system/blueprints/pages/raw.yaml
+++ b/system/blueprints/pages/raw.yaml
@@ -21,6 +21,7 @@ form:
             frontmatter:
               type: frontmatter
               label: PLUGIN_ADMIN.FRONTMATTER
+              autofocus: true
 
             content:
               type: markdown
diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index 1b7ac2f0b..415f3e19b 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -88,7 +88,7 @@ class Media extends Getters
 
                 $altMedium = $altMedium['file'];
 
-                $medium = MediumFactory::scaledFromMedium($altMedium, $ratio, 1);
+                $medium = MediumFactory::scaledFromMedium($altMedium, $ratio, 1)['file'];
             }
 
             if (!$medium) {
@@ -116,7 +116,7 @@ class Media extends Getters
                         continue;
                     }
 
-                    $types['alternative'][$i] = MediumFactory::scaledFromMedium($alternatives[$max], $max, $i);
+                    $types['alternative'][$i] = MediumFactory::scaledFromMedium($alternatives[$max]['file'], $max, $i);
                 }
 
                 foreach ($types['alternative'] as $ratio => $altMedium) {
diff --git a/system/src/Grav/Common/Page/Medium/MediumFactory.php b/system/src/Grav/Common/Page/Medium/MediumFactory.php
index ffa6b8f50..e15524e77 100644
--- a/system/src/Grav/Common/Page/Medium/MediumFactory.php
+++ b/system/src/Grav/Common/Page/Medium/MediumFactory.php
@@ -140,6 +140,6 @@ class MediumFactory
         $medium = self::fromFile($file);
         $medium->set('size', $size);
 
-        return $medium;
+        return ['file' => $medium, 'size' => $size];
     }
 }