diff --git a/src/js/modules/webslides.js b/src/js/modules/webslides.js
index 2dd6267..979831e 100644
--- a/src/js/modules/webslides.js
+++ b/src/js/modules/webslides.js
@@ -401,6 +401,11 @@ export default class WebSlides {
    */
   disable() {
     this.el.classList.add(CLASSES.DISABLED);
+
+    if (this.ws_.plugins.autoslide &&
+      this.plugins.autoslide.time !== false) {
+      this.plugins.autoslide.stop();
+    }
   }
 
   /**
@@ -408,6 +413,11 @@ export default class WebSlides {
    */
   enable() {
     this.el.classList.remove(CLASSES.DISABLED);
+
+    if (this.ws_.plugins.autoslide &&
+      this.ws_.plugins.autoslide.time !== false) {
+      this.ws_.plugins.autoslide.play();
+    }
   }
 
   /**
diff --git a/src/js/plugins/zoom.js b/src/js/plugins/zoom.js
index 2433585..2aa114c 100644
--- a/src/js/plugins/zoom.js
+++ b/src/js/plugins/zoom.js
@@ -49,10 +49,11 @@ export default class Zoom {
    * @param {Event} event Key down event.
    */
   onKeyDown(event) {
-    if (!this.isZoomed_ && Keys.MINUS.includes(event.which)) {
+    if (!this.isZoomed_ && Keys.MINUS.some(key => key === event.which)) {
       this.zoomIn();
     } else if (this.isZoomed_ &&
-      (Keys.PLUS.includes(event.which) || event.which === Keys.ESCAPE)) {
+      (Keys.PLUS.some(key => key === event.which) ||
+        event.which === Keys.ESCAPE)) {
       this.zoomOut();
     }
   }
@@ -143,6 +144,7 @@ export default class Zoom {
     this.zws_.el
       .querySelector(`#zoomed-${currentId}`)
       .classList.add(CLASSES.CURRENT);
+
     setTimeout(() => {
       this.ws_.disable();
     }, 400);