diff --git a/app/assets/javascripts/app/services/componentManager.js b/app/assets/javascripts/app/services/componentManager.js
index cf4b58a4c..52cde7942 100644
--- a/app/assets/javascripts/app/services/componentManager.js
+++ b/app/assets/javascripts/app/services/componentManager.js
@@ -772,7 +772,7 @@ class ComponentManager {
   }
 
   iframeForComponent(component) {
-    for(var frame of document.getElementsByTagName("iframe")) {
+    for(var frame of Array.from(document.getElementsByTagName("iframe"))) {
       var componentId = frame.dataset.componentId;
       if(componentId === component.uuid) {
         return frame;
diff --git a/app/assets/stylesheets/app/_modals.scss b/app/assets/stylesheets/app/_modals.scss
index c1d472e04..69b9754e1 100644
--- a/app/assets/stylesheets/app/_modals.scss
+++ b/app/assets/stylesheets/app/_modals.scss
@@ -59,7 +59,7 @@
   }
 
   > .content {
-    overflow-y: scroll;
+    overflow-y: auto;
     width: auto;
     padding: 0;
     padding-bottom: 0;
diff --git a/package-lock.json b/package-lock.json
index 765a76d8b..367778f61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -212,7 +212,7 @@
       "dev": true,
       "requires": {
         "babel-core": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
-        "babel-polyfill": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+        "babel-polyfill": "6.26.0",
         "babel-register": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
         "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
         "chokidar": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
@@ -1011,35 +1011,35 @@
       }
     },
     "babel-polyfill": {
-      "version": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
-      "dev": true,
       "requires": {
-        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-        "core-js": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.3",
         "regenerator-runtime": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"
       },
       "dependencies": {
         "babel-runtime": {
-          "version": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+          "version": "6.26.0",
+          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
-            "core-js": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-            "regenerator-runtime": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"
+            "core-js": "2.5.3",
+            "regenerator-runtime": "0.11.1"
           },
           "dependencies": {
             "regenerator-runtime": {
-              "version": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-              "integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE=",
-              "dev": true
+              "version": "0.11.1",
+              "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+              "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
             }
           }
         },
         "core-js": {
-          "version": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-          "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
-          "dev": true
+          "version": "2.5.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
+          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4="
         }
       }
     },
@@ -5549,8 +5549,7 @@
     },
     "regenerator-runtime": {
       "version": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
-      "dev": true
+      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
     },
     "regenerator-transform": {
       "version": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
diff --git a/public/extensions/extensions-manager b/public/extensions/extensions-manager
index c5706ed93..50d632e26 160000
--- a/public/extensions/extensions-manager
+++ b/public/extensions/extensions-manager
@@ -1 +1 @@
-Subproject commit c5706ed93eae1343efea505cfd077810553e5837
+Subproject commit 50d632e262d818ce86868bc5f12e7f5e936a1e2f