diff --git a/3rdParty/linenoise-ng/src/linenoise.cpp b/3rdParty/linenoise-ng/src/linenoise.cpp
index 9801ac9e92..bf20c952ad 100644
--- a/3rdParty/linenoise-ng/src/linenoise.cpp
+++ b/3rdParty/linenoise-ng/src/linenoise.cpp
@@ -533,8 +533,8 @@ struct linenoiseCompletions {
   vector<Utf32String> completionStrings;
 };
 
-#define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100
-#define LINENOISE_MAX_LINE 4096
+#define LINENOISE_DEFAULT_HISTORY_MAX_LEN 128
+#define LINENOISE_MAX_LINE 8192
 
 // make control-characters more readable
 #define ctrlChar(upperCaseASCII) (upperCaseASCII - 0x40)
diff --git a/arangod/GeneralServer/AuthenticationFeature.cpp b/arangod/GeneralServer/AuthenticationFeature.cpp
index 73b8dfad78..006a184cdd 100644
--- a/arangod/GeneralServer/AuthenticationFeature.cpp
+++ b/arangod/GeneralServer/AuthenticationFeature.cpp
@@ -188,6 +188,5 @@ AuthInfo* AuthenticationFeature::authInfo() {
   return _authInfo;
 }
 
-void AuthenticationFeature::unprepare() {}
+void AuthenticationFeature::unprepare() { INSTANCE = nullptr; }
 
-void AuthenticationFeature::stop() { INSTANCE = nullptr; }
diff --git a/arangod/GeneralServer/AuthenticationFeature.h b/arangod/GeneralServer/AuthenticationFeature.h
index 03689f71e5..92dc54a714 100644
--- a/arangod/GeneralServer/AuthenticationFeature.h
+++ b/arangod/GeneralServer/AuthenticationFeature.h
@@ -42,7 +42,6 @@ class AuthenticationFeature final
   void validateOptions(std::shared_ptr<options::ProgramOptions>) override final;
   void prepare() override final;
   void start() override final;
-  void stop() override final;
   void unprepare() override final;
 
   bool isActive() const { return _active && isEnabled(); }
diff --git a/arangod/V8Server/v8-collection.cpp b/arangod/V8Server/v8-collection.cpp
index a1af54afa4..0eeabc546b 100644
--- a/arangod/V8Server/v8-collection.cpp
+++ b/arangod/V8Server/v8-collection.cpp
@@ -3063,6 +3063,8 @@ static void JS_CollectionsVocbase(
     };
     colls = GetCollectionsCluster(vocbase);
   } else {
+    // no cleanup needed
+    cleanup = []() {};
     colls = vocbase->collections(false);
   }