diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 366457a6..ef037964 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -21,8 +21,8 @@
       "intelliSenseMode": "clang-x64",
       "includePath": [
           "${pocoIncludePath}",
-          "/usr/local/opt/openssl@3",
-          "/opt/homebrew/opt/openssl@3"
+          "/usr/local/opt/openssl@3/include",
+          "/opt/homebrew/opt/openssl@3/include"
       ],
       "macFrameworkPath": ["/System/Library/Frameworks"],
       "defines": [
diff --git a/WebTunnel/WebTunnelAgentLib/include/webtunnelagent.h b/WebTunnel/WebTunnelAgentLib/include/webtunnelagent.h
index dd164602..4b3097cd 100644
--- a/WebTunnel/WebTunnelAgentLib/include/webtunnelagent.h
+++ b/WebTunnel/WebTunnelAgentLib/include/webtunnelagent.h
@@ -68,6 +68,15 @@ typedef enum webtunnel_agent_result
 } webtunnel_agent_result;
 
 
+typedef enum webtunnel_agent_status
+{
+	webtunnel_agent_status_disconnected = 0,
+	webtunnel_agent_status_connected = 1,
+	webtunnel_agent_status_error = 2,
+	webtunnel_agent_status_unknown = 3
+} webtunnel_agent_status;
+
+
 typedef enum webtunnel_agent_port_type
 {
 	webtunnel_port_http = 0,
@@ -80,15 +89,6 @@ typedef enum webtunnel_agent_port_type
 } webtunnel_agent_port_type;
 
 
-typedef enum webtunnel_agent_status
-{
-	webtunnel_agent_status_disconnected = 0,
-	webtunnel_agent_status_connected = 1,
-	webtunnel_agent_status_error = 2,
-	webtunnel_agent_status_unknown = 3
-} webtunnel_agent_status;
-
-
 typedef struct webtunnel_agent_port_spec
 {
 	unsigned short port;
diff --git a/WebTunnel/WebTunnelAgentLib/src/Tunnel.cpp b/WebTunnel/WebTunnelAgentLib/src/Tunnel.cpp
index ad96171a..d2c7a3f9 100644
--- a/WebTunnel/WebTunnelAgentLib/src/Tunnel.cpp
+++ b/WebTunnel/WebTunnelAgentLib/src/Tunnel.cpp
@@ -189,7 +189,7 @@ void Tunnel::startPropertiesUpdateTask()
 {
 	_logger.debug("Starting PropertiesUpdateTask..."s);
 	_pPropertiesUpdateTask = new PropertiesUpdateTask(Ptr(this, true));
-	_pTimer->scheduleAtFixedRate(_pPropertiesUpdateTask, _propertiesUpdateInterval.totalMilliseconds(), _propertiesUpdateInterval.totalMilliseconds());
+	_pTimer->scheduleAtFixedRate(_pPropertiesUpdateTask, static_cast<long>(_propertiesUpdateInterval.totalMilliseconds()), static_cast<long>(_propertiesUpdateInterval.totalMilliseconds()));
 }
 
 
diff --git a/WebTunnel/WebTunnelAgentLib/src/webtunnelagent.cpp b/WebTunnel/WebTunnelAgentLib/src/webtunnelagent.cpp
index b0fccca3..93d9a631 100644
--- a/WebTunnel/WebTunnelAgentLib/src/webtunnelagent.cpp
+++ b/WebTunnel/WebTunnelAgentLib/src/webtunnelagent.cpp
@@ -420,6 +420,7 @@ void WebTunnelAgent_API webtunnel_agent_destroy(webtunnel_agent wt)
 		try
 		{
 			pHolder->signature = 0xDEADBEEF;
+			pHolder->pTunnel->stop();
 			delete pHolder;
 		}
 		catch (...)