diff --git a/src/Lib/Document/VivyDocumentStore.cc b/src/Lib/Document/VivyDocumentStore.cc
index 3d9618c86f192b0c79b8abce9a25f1fd34ddb042..ebd9a000d18dc7ad68c188be50c861a04ea451ec 100644
--- a/src/Lib/Document/VivyDocumentStore.cc
+++ b/src/Lib/Document/VivyDocumentStore.cc
@@ -9,8 +9,9 @@ VivyDocumentStore::newDocument(VivyDocument::Options opt)
     // Add the memory flag
     opt = static_cast<VivyDocument::Options>(opt | VivyDocument::MemoryDocumentCreation);
 
-    const QString newDocName = newDocumentBaseName + QString::number(newDocumentNumber++);
+    const QString newDocName = newDocumentBaseName + QString::number(newDocumentNumber);
     auto ret                 = std::make_shared<VivyDocument>(newDocName, opt);
+    newDocumentNumber++;
 
     if (ret) {
         const Uuid uuid = ret->getUuid();
diff --git a/src/Lib/Log.cc b/src/Lib/Log.cc
index 8cbebd7594a45800e6fc2b13f1b6f2a80a7506ea..b18598aed73f6bf726a61a24fa65e3c41fdeb1f2 100644
--- a/src/Lib/Log.cc
+++ b/src/Lib/Log.cc
@@ -40,7 +40,7 @@ StderrLogSinkDispatcher::handleLogMessage(const std::string_view category,
 {
     std::cerr << "#(" << trunkFileName(msg.getHeader().fileName) << " +"
               << msg.getHeader().lineNumberInFile << " | "
-              << LogLevel::toStdStringView(msg.getHeader().severity) << " -> " << category << ")\t"
+              << LogLevel::toStdStringView(msg.getHeader().severity) << " -> " << category << ") "
               << msg.getTextBuffer() << '\n';
 }
 }
diff --git a/src/VivyApplication.cc b/src/VivyApplication.cc
index 959fb498ee963830c45e371846a392004d9f194d..8f7e46d9f507e8c0b348ce4110d0efa9a07de33b 100644
--- a/src/VivyApplication.cc
+++ b/src/VivyApplication.cc
@@ -1,11 +1,15 @@
 #include "VivyApplication.hh"
 #include "UI/MainWindow.hh"
+#include "Lib/Document/VivyDocumentStore.hh"
+#include "Lib/Script/ScriptStore.hh"
 
 using namespace Vivy;
 
 VivyApplication::VivyApplication(int &argc, char **argv)
     : QApplication(argc, argv)
 {
+    documentStore = std::make_shared<VivyDocumentStore>();
+    scriptStore   = std::make_shared<ScriptStore>();
     VIVY_LOG_CTOR() << "Construction is OK";
 }
 
diff --git a/src/VivyApplication.hh b/src/VivyApplication.hh
index 4a9985a35c48c5ed41d87f2dc2087f74f5ef7840..9ac75fed021016596743e7466e10c089b1009196 100644
--- a/src/VivyApplication.hh
+++ b/src/VivyApplication.hh
@@ -46,8 +46,8 @@ class VivyApplication : public QApplication {
     VIVY_LOGGABLE_OBJECT(logSink, APPLICATION, logger)
 
 public:
-    std::shared_ptr<VivyDocumentStore> documentStore{};
-    std::shared_ptr<ScriptStore> scriptStore{};
+    std::shared_ptr<VivyDocumentStore> documentStore;
+    std::shared_ptr<ScriptStore> scriptStore;
 
     enum class Font {
         Monospace,