diff --git a/assets/javascripts/discourse/components/explorer-schema-onetable.js.es6 b/assets/javascripts/discourse/components/explorer-schema-onetable.js.es6
index 98545c9..3b3f147 100644
--- a/assets/javascripts/discourse/components/explorer-schema-onetable.js.es6
+++ b/assets/javascripts/discourse/components/explorer-schema-onetable.js.es6
@@ -2,7 +2,7 @@ export default Ember.Component.extend({
   classNameBindings: [":schema-table", "open"],
   tagName: "li",
 
-  open: Em.computed.alias("table.open"),
+  open: Ember.computed.alias("table.open"),
 
   _bindClicks: function() {
     const self = this;
diff --git a/assets/javascripts/discourse/components/explorer-schema.js.es6 b/assets/javascripts/discourse/components/explorer-schema.js.es6
index b0c1e0f..7e6518d 100644
--- a/assets/javascripts/discourse/components/explorer-schema.js.es6
+++ b/assets/javascripts/discourse/components/explorer-schema.js.es6
@@ -52,7 +52,7 @@ export default Ember.Component.extend({
   }.property("schema"),
 
   rfilter: function() {
-    if (!Em.isBlank(this.get("filter"))) {
+    if (!Ember.isBlank(this.get("filter"))) {
       return new RegExp(this.get("filter"));
     }
   }.property("filter"),
@@ -99,7 +99,7 @@ export default Ember.Component.extend({
             filterCols.push(col);
           }
         });
-        if (!Em.isEmpty(filterCols)) {
+        if (!Ember.isEmpty(filterCols)) {
           tables.push({
             name: key,
             columns: filterCols,
diff --git a/assets/javascripts/discourse/components/param-input.js.es6 b/assets/javascripts/discourse/components/param-input.js.es6
index 1ba3618..4253baa 100644
--- a/assets/javascripts/discourse/components/param-input.js.es6
+++ b/assets/javascripts/discourse/components/param-input.js.es6
@@ -66,7 +66,7 @@ export default Ember.Component.extend({
     const type = this.get("info.type"),
       value = this.get("value");
 
-    if (Em.isEmpty(this.get("value"))) {
+    if (Ember.isEmpty(this.get("value"))) {
       return this.get("info.nullable");
     }
 
diff --git a/assets/javascripts/discourse/components/query-result.js.es6 b/assets/javascripts/discourse/components/query-result.js.es6
index 72cf5c3..d3a11fa 100644
--- a/assets/javascripts/discourse/components/query-result.js.es6
+++ b/assets/javascripts/discourse/components/query-result.js.es6
@@ -26,11 +26,11 @@ function transformedRelTable(table, modelClass) {
 const QueryResultComponent = Ember.Component.extend({
   layoutName: "explorer-query-result",
 
-  rows: Em.computed.alias("content.rows"),
-  columns: Em.computed.alias("content.columns"),
-  params: Em.computed.alias("content.params"),
-  explainText: Em.computed.alias("content.explain"),
-  hasExplain: Em.computed.notEmpty("content.explain"),
+  rows: Ember.computed.alias("content.rows"),
+  columns: Ember.computed.alias("content.columns"),
+  params: Ember.computed.alias("content.params"),
+  explainText: Ember.computed.alias("content.explain"),
+  hasExplain: Ember.computed.notEmpty("content.explain"),
 
   @computed("content.result_count")
   resultCount: function(count) {
@@ -184,7 +184,7 @@ const QueryResultComponent = Ember.Component.extend({
 
       document.body.appendChild(form);
       form.submit();
-      Em.run.next("afterRender", function() {
+      Ember.run.next("afterRender", function() {
         document.body.removeChild(form);
       });
     });
diff --git a/assets/javascripts/discourse/components/query-row-content.js.es6 b/assets/javascripts/discourse/components/query-row-content.js.es6
index aa7e020..e23acf6 100644
--- a/assets/javascripts/discourse/components/query-row-content.js.es6
+++ b/assets/javascripts/discourse/components/query-row-content.js.es6
@@ -84,7 +84,6 @@ const QueryRowContentComponent = Ember.Component.extend(
             (t.template || fallback)(ctx, params)
           );
         } catch (e) {
-          console.error(e);
           return "error";
         }
       });
diff --git a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
index 35cd8c8..f7ff5d1 100644
--- a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
@@ -17,7 +17,7 @@ export default Ember.Controller.extend({
 
   saveDisabled: Ember.computed.not("selectedItem.dirty"),
   runDisabled: Ember.computed.alias("selectedItem.dirty"),
-  results: Em.computed.alias("selectedItem.results"),
+  results: Ember.computed.alias("selectedItem.results"),
 
   asc: null,
   order: null,
@@ -25,10 +25,10 @@ export default Ember.Controller.extend({
   everEditing: false,
   showRecentQueries: true,
   sortBy: ["last_run_at:desc"],
-  sortedQueries: Em.computed.sort("model", "sortBy"),
+  sortedQueries: Ember.computed.sort("model", "sortBy"),
 
   @computed("search", "sortBy")
-  filteredContent(search) {
+  filteredContent() {
     const regexp = new RegExp(this.get("search"), "i");
     return this.get("sortedQueries").filter(function(result) {
       return (
diff --git a/assets/javascripts/discourse/controllers/import-query.js.es6 b/assets/javascripts/discourse/controllers/import-query.js.es6
index 1741d00..f55949e 100644
--- a/assets/javascripts/discourse/controllers/import-query.js.es6
+++ b/assets/javascripts/discourse/controllers/import-query.js.es6
@@ -2,7 +2,7 @@ import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  notReady: Em.computed.not("ready"),
+  notReady: Ember.computed.not("ready"),
 
   adminPluginsExplorer: Ember.inject.controller(),
 
diff --git a/assets/javascripts/discourse/lib/binary-search.js.es6 b/assets/javascripts/discourse/lib/binary-search.js.es6
index bff5977..6e1b1a6 100644
--- a/assets/javascripts/discourse/lib/binary-search.js.es6
+++ b/assets/javascripts/discourse/lib/binary-search.js.es6
@@ -12,10 +12,10 @@ export default function binarySearch(list, target, keyProp) {
   while (min <= max) {
     guess = Math.floor((min + max) / 2);
 
-    if (Em.get(list[guess], keyProperty) === target) {
+    if (Ember.get(list[guess], keyProperty) === target) {
       return guess;
     } else {
-      if (Em.get(list[guess], keyProperty) < target) {
+      if (Ember.get(list[guess], keyProperty) < target) {
         min = guess + 1;
       } else {
         max = guess - 1;