diff --git a/html/admin/js/client/client.js b/html/admin/js/client/client.js
index 227e4604f5..8158e06f65 100644
--- a/html/admin/js/client/client.js
+++ b/html/admin/js/client/client.js
@@ -185,5 +185,5 @@ var Buffer = require("buffer").Buffer;
 
 // Local Variables:
 // mode: outline-minor
-// outline-regexp: "/// @brief\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}\\|/\\*jslint"
+// outline-regexp: "\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)"
 // End:
diff --git a/js/Makefile.files b/js/Makefile.files
index 68796ac23d..08ed9f6a8b 100644
--- a/js/Makefile.files
+++ b/js/Makefile.files
@@ -71,7 +71,8 @@ jslint:
 			--log.level error \
 			--server.password "" \
 			--javascript.startup-directory @srcdir@/js \
-			--javascript.modules-path "@srcdir@/js/client/modules;@srcdir@/js/common/modules" \
+			--javascript.modules-path "@srcdir@/js/client/modules;@srcdir@/js/common/modules;@srcdir@/js/node" \
+			--javascript.package-path "@srcdir@/js/npm;@srcdir@/js/common/test-data/modules" \
 			--jslint $$file; \
 	done
 
diff --git a/js/client/client.js b/js/client/client.js
index 227e4604f5..8158e06f65 100644
--- a/js/client/client.js
+++ b/js/client/client.js
@@ -185,5 +185,5 @@ var Buffer = require("buffer").Buffer;
 
 // Local Variables:
 // mode: outline-minor
-// outline-regexp: "/// @brief\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}\\|/\\*jslint"
+// outline-regexp: "\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)"
 // End:
diff --git a/js/common/modules/org/arangodb/aql/functions.js b/js/common/modules/org/arangodb/aql/functions.js
index a65e0441b8..3d4890bfe4 100644
--- a/js/common/modules/org/arangodb/aql/functions.js
+++ b/js/common/modules/org/arangodb/aql/functions.js
@@ -47,6 +47,24 @@ var ArangoError = arangodb.ArangoError;
 /// @{
 ////////////////////////////////////////////////////////////////////////////////
 
+////////////////////////////////////////////////////////////////////////////////
+/// @brief return the _aqlfunctions collection
+////////////////////////////////////////////////////////////////////////////////
+
+var getStorage = function () {
+  var functions = db._collection("_aqlfunctions");
+
+  if (functions === null) {
+    var err = new ArangoError();
+    err.errorNum = arangodb.errors.ERROR_ARANGO_COLLECTION_NOT_FOUND.code;
+    err.errorMessage = "collection '_aqlfunctions' not found";
+
+    throw err;
+  }
+
+  return functions;
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief apply a prefix filter on the functions
 ////////////////////////////////////////////////////////////////////////////////
@@ -126,24 +144,6 @@ var stringifyFunction = function (code, name) {
   throw err;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-/// @brief return the _aqlfunctions collection
-////////////////////////////////////////////////////////////////////////////////
-
-var getStorage = function () {
-  var functions = db._collection("_aqlfunctions");
-
-  if (functions === null) {
-    var err = new ArangoError();
-    err.errorNum = arangodb.errors.ERROR_ARANGO_COLLECTION_NOT_FOUND.code;
-    err.errorMessage = "collection '_aqlfunctions' not found";
-
-    throw err;
-  }
-
-  return functions;
-};
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @}
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/js/server/server.js b/js/server/server.js
index e654409c9d..c87c0278b5 100644
--- a/js/server/server.js
+++ b/js/server/server.js
@@ -47,5 +47,5 @@ var Buffer = require("buffer").Buffer;
 
 // Local Variables:
 // mode: outline-minor
-// outline-regexp: "/// @brief\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}\\|/\\*jslint"
+// outline-regexp: "\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)"
 // End:
diff --git a/js/server/version-check.js b/js/server/version-check.js
index 47153d3997..9c22e8c09e 100644
--- a/js/server/version-check.js
+++ b/js/server/version-check.js
@@ -356,7 +356,7 @@
     });
     
     // create a unique index on collection attribute in _aal
-    addTask("createFisbowlIndex",
+    addTask("createFishbowlIndex",
             "create indexes on collection attribute in _fishbowl collection",
       function () {
         var fishbowl = getCollection("_fishbowl");
diff --git a/lib/V8/v8-wrapper.h b/lib/V8/v8-wrapper.h
index fa3b48a964..bec9706a3e 100644
--- a/lib/V8/v8-wrapper.h
+++ b/lib/V8/v8-wrapper.h
@@ -112,7 +112,7 @@ class V8Wrapper {
 
         // TODO causes this warning on compilation: 
         // ‘void v8::Persistent<T>::Dispose() [with T = v8::Object]’ is deprecated (declared at ./3rdParty/V8/include/v8.h:4406) [-Wdeprecated-declarations]
-        _handle.Dispose();
+        _handle.Dispose(_isolate);
 
         _handle.Clear();