diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index 1ea67bf5278cd231dd423c9120042fbd2e8a83fa..5f773190d64e7a7406e6867a615fedac4c22c775 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -547,6 +547,7 @@ int MergePostProcessingFile(const std::string &fileName, bool showLastStep,
 
 void ClearProject()
 {
+  Msg::Info("Clearing all models and views...");
 #if defined(HAVE_POST)
   for(int i = PView::list.size() - 1; i >= 0; i--)
     delete PView::list[i];
@@ -563,6 +564,7 @@ void ClearProject()
       fclose(openedFiles[i]);
     openedFiles.clear();
   }
+  Msg::Info("Done clearing all models and views");
 
   new GModel();
   GModel::current()->setFileName(CTX::instance()->defaultFileName);
diff --git a/Fltk/onelabGroup.cpp b/Fltk/onelabGroup.cpp
index add0c8fcdb28227c5ed57b60a97b2a65ce616fec..58d2406bf463c7a5832e64a8b0eb6c34ae59c9c8 100644
--- a/Fltk/onelabGroup.cpp
+++ b/Fltk/onelabGroup.cpp
@@ -74,11 +74,11 @@ class onelabGmshServer : public GmshServer{
         // if asked, refresh the onelab GUI
         std::vector<onelab::string> ps;
         onelab::server::instance()->get(ps, "Gmsh/Action");
-        if(FlGui::available() && ps.size() && ps[0].getValue() == "refresh"){
+        if(ps.size() && ps[0].getValue() == "refresh"){
           ps[0].setVisible(false);
           ps[0].setValue("");
           onelab::server::instance()->set(ps[0]);
-          onelab_cb(0, (void*)"refresh");
+          if(FlGui::available()) onelab_cb(0, (void*)"refresh");
         }
         // wait at most waitint seconds and respond to FLTK events
         if(FlGui::available()) FlGui::instance()->wait(waitint);
@@ -1588,7 +1588,7 @@ void solver_batch_cb(Fl_Widget *w, void *data)
   onelab::string o(c->getName() + "/Action");
 
   // initialize
-  onelabUtils::runGmshClient("initalize", CTX::instance()->solver.autoMesh);
+  onelabUtils::runGmshClient("initialize", CTX::instance()->solver.autoMesh);
   o.setValue("initialize");
   onelab::server::instance()->set(o);
   c->run();
@@ -1601,6 +1601,7 @@ void solver_batch_cb(Fl_Widget *w, void *data)
 
   // check
   onelabUtils::runGmshClient("check", CTX::instance()->solver.autoMesh);
+  onelabUtils::guessModelName(c);
   o.setValue("check");
   onelab::server::instance()->set(o);
   c->run();