diff --git a/src/assets/stylesheets/create-object-dialog.scss b/src/assets/stylesheets/create-object-dialog.scss
index a22f0c605f9b093a5d5384d22f0c9212f3597148..9500fa41e328409b46915719dfa3f3cb5f4de6b0 100644
--- a/src/assets/stylesheets/create-object-dialog.scss
+++ b/src/assets/stylesheets/create-object-dialog.scss
@@ -65,7 +65,7 @@
   font-size: 1.2em;
   align-self: center;
   overflow: hidden;
-  text-overflow: ellipsis; 
+  text-overflow: ellipsis;
 }
 
 :local(.hide-file-input) {
diff --git a/src/components/gltf-model-plus.js b/src/components/gltf-model-plus.js
index 8b1d02b7d3d334ddbf84c18f5f8c89f4920b504b..fc16ac0589b67b2712101b177b5ac9e21c45bcf4 100644
--- a/src/components/gltf-model-plus.js
+++ b/src/components/gltf-model-plus.js
@@ -200,7 +200,7 @@ function cachedLoadGLTF(src, basePath, contentType, preferredTechnique, onProgre
       try {
         let gltfUrl = src;
         let onLoad = resolve;
-        if (contentType === "model/gltf+zip" || contentType === "application/x-zip-compressed") {
+        if (contentType.includes("model/gltf+zip") || contentType.includes("application/x-zip-compressed")) {
           const fileMap = await getFilesFromSketchfabZip(src);
           gltfUrl = fileMap["scene.gtlf"];
           onLoad = model => {
diff --git a/src/components/image-plus.js b/src/components/image-plus.js
index 5110cebbaca330f9ce53aa32d2d5fbee0963c196..067d9bad2fcc26cdc0166a9dd19aeddb6bc20eb6 100644
--- a/src/components/image-plus.js
+++ b/src/components/image-plus.js
@@ -191,7 +191,7 @@ AFRAME.registerComponent("image-plus", {
         cacheItem = { count: 1 };
         if (url === "error") {
           texture = errorTexture;
-        } else if (contentType === "image/gif") {
+        } else if (contentType.includes("image/gif")) {
           texture = await this.loadGIF(url);
         } else if (contentType.startsWith("image/")) {
           texture = await this.loadImage(url);
diff --git a/src/components/media-loader.js b/src/components/media-loader.js
index d71801161631a4985ad3e127b5f05c9b330b919e..a384309722de41b8731fe00d236923de954e84ef 100644
--- a/src/components/media-loader.js
+++ b/src/components/media-loader.js
@@ -92,8 +92,8 @@ AFRAME.registerComponent("media-loader", {
         this.el.setAttribute("image-plus", { src: blobUrl || raw, contentType });
         this.el.setAttribute("position-at-box-shape-border", { target: ".delete-button", dirs: ["forward", "back"] });
       } else if (
-        contentType.indexOf("application/octet-stream") !== -1 ||
-        contentType.indexOf("x-zip-compressed") !== -1 ||
+        contentType.includes("application/octet-stream") ||
+        contentType.includes("x-zip-compressed") ||
         contentType.startsWith("model/gltf") ||
         url.endsWith(".gltf") ||
         url.endsWith(".glb")
diff --git a/src/utils/media-utils.js b/src/utils/media-utils.js
index 770b69819495680d2b012571273c861bdde9264a..ab2189cd4aac5e6a742ec473fd49bccf506762a3 100644
--- a/src/utils/media-utils.js
+++ b/src/utils/media-utils.js
@@ -41,7 +41,7 @@ export const addMedia = (src, resize = false) => {
   entity.setAttribute("media-loader", { resize, src: typeof src === "string" ? src : "" });
   scene.appendChild(entity);
 
-  if (typeof src === "object") {
+  if (src instanceof File) {
     upload(src)
       .then(response => {
         const src = response.raw;