diff --git a/js/server/modules/org/arangodb/foxx/arangoApp.js b/js/server/modules/org/arangodb/foxx/arangoApp.js
index 8d7d528141..062c90ac84 100644
--- a/js/server/modules/org/arangodb/foxx/arangoApp.js
+++ b/js/server/modules/org/arangodb/foxx/arangoApp.js
@@ -39,6 +39,7 @@
   var internal = require("internal");
   var db = internal.db;
   var _= require("underscore");
+  var Foxx = require("org/arangodb/foxx");
   var utils = require("org/arangodb/foxx/manager-utils");
   var console = require("console");
   var arangodb = require("org/arangodb");
@@ -194,7 +195,7 @@ var computeRootAppPath = function(mount, isValidation) {
         configurable: true,
         enumerable: true,
         get: function () {
-          return require('org/arangodb/foxx').requireApp(mount);
+          return Foxx.requireApp(mount);
         }
       });
     }, this);
diff --git a/js/server/modules/org/arangodb/foxx/manager.js b/js/server/modules/org/arangodb/foxx/manager.js
index 44d40f749c..9ab7647b40 100644
--- a/js/server/modules/org/arangodb/foxx/manager.js
+++ b/js/server/modules/org/arangodb/foxx/manager.js
@@ -42,7 +42,6 @@ var joi = require("joi");
 var utils = require("org/arangodb/foxx/manager-utils");
 var store = require("org/arangodb/foxx/store");
 var console = require("console");
-var Foxx = require("org/arangodb/foxx");
 var ArangoApp = require("org/arangodb/foxx/arangoApp").ArangoApp;
 var TemplateEngine = require("org/arangodb/foxx/templateEngine").Engine;
 var routeApp = require("org/arangodb/foxx/routing").routeApp;
@@ -1293,15 +1292,15 @@ var upgrade = function(appInfo, mount, options) {
   var oldApp = lookupApp(mount);
   var oldConf = oldApp.getConfiguration(true);
   options.configuration = options.configuration || {};
-  Object.keys(oldConf).forEach(function (attr) {
-    if (!options.configuration.hasOwnProperty(attr)) {
-      options.configuration[attr] = oldConf[attr];
+  Object.keys(oldConf).forEach(function (key) {
+    if (!options.configuration.hasOwnProperty(key)) {
+      options.configuration[key] = oldConf[key];
     }
   });
   var oldDeps = oldApp._options.dependencies || {};
   options.dependencies = options.dependencies || {};
   Object.keys(oldDeps).forEach(function (key) {
-    if (!options.dependencies.hasOwnProperty(attr)) {
+    if (!options.dependencies.hasOwnProperty(key)) {
       options.dependencies[key] = oldDeps[key];
     }
   });