diff --git a/udphandler.cpp b/udphandler.cpp
index 8d39d73..285c7ce 100644
--- a/udphandler.cpp
+++ b/udphandler.cpp
@@ -50,7 +50,7 @@ udpHandler::~udpHandler()
         SendPacketDisconnect();
 
     }
-    _sleep(100);
+    //_sleep(100);
     udp->close();
     delete udp;
     qDebug() << "Closing udpHandler";
@@ -396,7 +396,7 @@ udpSerial::~udpSerial()
     qDebug() << "Closing udpSerial";
     SendPacketOpenClose(true);
     SendPacketDisconnect();
-    _sleep(100);
+    //_sleep(100);
     udp->close();
     delete udp;
 }
@@ -626,7 +626,7 @@ udpAudio::~udpAudio()
 {
     qDebug() << "Closing udpAudio";
     SendPacketDisconnect();
-    _sleep(100);
+    //_sleep(100);
 
     udp->close();
     delete udp;
diff --git a/wfmain.cpp b/wfmain.cpp
index 95e5d34..931ee89 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -355,7 +355,9 @@ wfmain::wfmain(const QString serialPortCL, const QString hostCL, QWidget *parent
 wfmain::~wfmain()
 {
 #ifdef Q_OS_WIN // Prevent crash on exit in Windows.
+    delete rig;
     rigThread->quit();
+    rigThread->wait();
 #endif
     delete ui;
 }