diff --git a/www/code/inner.js b/www/code/inner.js
index 1799819dd..66010a485 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -367,7 +367,6 @@ define([
 
     var getThumbnailContainer = function () {
         var $preview = $('#cp-app-code-preview-content');
-        var $codeMirror = $('.CodeMirror');
         if ($preview.length && $preview.is(':visible')) {
             return $preview[0];
         }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 8bf3474c1..35a5d38ec 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -463,7 +463,6 @@ define([
     UIElements.createButton = function (common, type, rightside, data, callback) {
         var AppConfig = common.getAppConfig();
         var button;
-        var size = "17px";
         var sframeChan = common.getSframeChannel();
         switch (type) {
             case 'export':
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index a9554f634..a000025d1 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -777,7 +777,7 @@ define([
             content: '<span class="fa fa-plus-circle"></span> ' + Messages.creation_appMenuName
         });
         $(window).keydown(function (e) {
-            if (e.which === 69 && (e.ctrlKey || e.metaKey)) {
+            if (e.which === 69 && (e.ctrlKey || (navigator.platform === "MacIntel" && e.metaKey))) {
                 Common.createNewPadModal();
             }
         });
diff --git a/www/drive/inner.js b/www/drive/inner.js
index 26f504797..58d547b0e 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -41,7 +41,8 @@ define([
 {
     var APP = window.APP = {
         editable: false,
-        mobile: function () { return $('body').width() <= 600; } // Menu and content area are not inline-block anymore for mobiles
+        mobile: function () { return $('body').width() <= 600; }, // Menu and content area are not inline-block anymore for mobiles
+        isMac: navigator.platform === "MacIntel"
     };
 
     var stringify = function (obj) {
@@ -549,7 +550,7 @@ define([
             }
 
             // Ctrl+A select all
-            if (e.which === 65 && e.ctrlKey) {
+            if (e.which === 65 && (e.ctrlKey || (e.metaKey && APP.isMac))) {
                 $content.find('.cp-app-drive-element:not(.cp-app-drive-element-selected)')
                     .addClass('cp-app-drive-element-selected');
                 return;
diff --git a/www/slide/inner.js b/www/slide/inner.js
index abbf3828f..44073bb46 100644
--- a/www/slide/inner.js
+++ b/www/slide/inner.js
@@ -556,7 +556,6 @@ define([
     };
 
     var getThumbnailContainer = function () {
-        var $codeMirror = $('.CodeMirror');
         var $c = $('#cp-app-slide-editor');
         if ($c.hasClass('cp-app-slide-preview')) {
             return $('.cp-app-slide-frame').first()[0];