diff --git a/src/gui.cxx b/src/gui.cxx
index b7f5f7c..1c28d41 100644
--- a/src/gui.cxx
+++ b/src/gui.cxx
@@ -72,7 +72,7 @@ static void gui_static_read_rb(void* inst)
 static void gui_static_nsm_cb(void* inst)
 {
   nsm_check_nowait( gui->getNsm() );
-  Fl::repeat_timeout( 1 / 1.f, &gui_static_nsm_cb, inst);
+  Fl::repeat_timeout( 1 / 30.f, &gui_static_nsm_cb, inst);
 }
 
 void option_controller_cb(Fl_Widget*,void* data)
@@ -436,7 +436,6 @@ int Gui::quit()
 {
   jack->quit();
   window.hide();
-  exit(0);
 }
 
 void Gui::askQuit()
diff --git a/src/jack.cxx b/src/jack.cxx
index f2e44e9..81d593e 100644
--- a/src/jack.cxx
+++ b/src/jack.cxx
@@ -223,7 +223,7 @@ void Jack::activate()
 
 void Jack::quit()
 {
-  jack_deactivate( client );
+  //jack_deactivate( client );
   jack_client_close( client );
   LUPPP_NOTE("%s","Quit JACK.");
 }