diff --git a/Software/Integrationtests/tests/TestBase.py b/Software/Integrationtests/tests/TestBase.py
index 5b057306..d1b5d0d8 100644
--- a/Software/Integrationtests/tests/TestBase.py
+++ b/Software/Integrationtests/tests/TestBase.py
@@ -32,8 +32,6 @@ def setUp(self):
         if self.vna.query(":DEV:CONN?") == "Not connected":
             self.tearDown()
             raise AssertionError("Not connected")
-        # Tests occasionally fail without this timeout - give GUI a little bit more time to properly start
-        time.sleep(1)
                
     def tearDown(self):
         self.gui.send_signal(SIGINT)
diff --git a/Software/PC_Application/.gitignore b/Software/PC_Application/.gitignore
index 633b8e22..f3e28c86 100644
--- a/Software/PC_Application/.gitignore
+++ b/Software/PC_Application/.gitignore
@@ -78,6 +78,9 @@ Application
 /LibreVNA-GUI/users*appdatalocaltemp*
 /LibreVNA/build
 
+# qmake.stash
+LibreVNA-GUI/.qmake.stash
+
 
 
 
diff --git a/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp b/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp
index dcc1611a..ddf092e5 100644
--- a/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp
@@ -342,6 +342,7 @@ void SpectrumAnalyzer::deactivate()
 {
     setOperationPending(false);
     StoreSweepSettings();
+    configurationTimer.stop();
     Mode::deactivate();
 }
 
@@ -874,6 +875,7 @@ void SpectrumAnalyzer::Stop()
 
 void SpectrumAnalyzer::ConfigureDevice()
 {
+    configurationTimer.stop();
     if(running) {
         changingSettings = true;
 
diff --git a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
index 29be2572..c7e64d33 100644
--- a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
@@ -738,6 +738,7 @@ void VNA::deactivate()
 {
     setOperationPending(false);
     StoreSweepSettings();
+    configurationTimer.stop();
     Mode::deactivate();
 }
 
@@ -1839,6 +1840,7 @@ void VNA::Stop()
 
 void VNA::ConfigureDevice(bool resetTraces, std::function<void(bool)> cb)
 {
+    configurationTimer.stop();
     if(running) {
         if (resetTraces) {
             ResetLiveTraces();
diff --git a/Software/PC_Application/LibreVNA-GUI/appwindow.cpp b/Software/PC_Application/LibreVNA-GUI/appwindow.cpp
index c1aa9988..d89e55ad 100644
--- a/Software/PC_Application/LibreVNA-GUI/appwindow.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/appwindow.cpp
@@ -1020,7 +1020,7 @@ void AppWindow::SetupSCPI()
 void AppWindow::StartTCPServer(int port)
 {
     server = new TCPServer(port);
-    connect(server, &TCPServer::received, &scpi, &SCPI::input);
+    connect(server, &TCPServer::received, &scpi, &SCPI::input, Qt::QueuedConnection);
     connect(&scpi, &SCPI::output, server, &TCPServer::send);
 }