diff --git a/src/vscp/common/canal-xmlconfig.h b/src/vscp/common/canal-xmlconfig.h
index 4e9eea381..665020a8e 100644
--- a/src/vscp/common/canal-xmlconfig.h
+++ b/src/vscp/common/canal-xmlconfig.h
@@ -1062,7 +1062,7 @@ class canalXmlConfig
     std::string getDescription(void) { return m_description; }
 
     // Setters for level
-    void setLevel(uint8_t level) { m_level = m_level; };
+    void setLevel(uint8_t level) { m_level = level; };
     uint8_t getLevel(void) { return m_level; }
 
     // Setters for bBlocking
diff --git a/src/vscp/common/vscp-bootdevice-pic1.h b/src/vscp/common/vscp-bootdevice-pic1.h
index 885833f47..32b73925c 100644
--- a/src/vscp/common/vscp-bootdevice-pic1.h
+++ b/src/vscp/common/vscp-bootdevice-pic1.h
@@ -86,7 +86,7 @@ class CBootDevice_PIC1 : public CBootDevice {
                    uint32_t timeout                                      = REGISTER_DEFAULT_TIMEOUT);
 
   // Dtor
-  ~CBootDevice_PIC1(void);
+  virtual ~CBootDevice_PIC1(void);
 
   // Used VSCP commands
   static const uint8_t VSCP_PIC1_READ_REGISTER        = 0x09;
diff --git a/src/vscp/common/vscp-bootdevice-vscp.h b/src/vscp/common/vscp-bootdevice-vscp.h
index bbf78471e..51fa6d862 100644
--- a/src/vscp/common/vscp-bootdevice-vscp.h
+++ b/src/vscp/common/vscp-bootdevice-vscp.h
@@ -92,7 +92,7 @@ class CBootDevice_VSCP : public CBootDevice {
                    uint32_t timeout                                      = REGISTER_DEFAULT_TIMEOUT);
 
   /// Dtor
-  ~CBootDevice_VSCP(void);
+  virtual ~CBootDevice_VSCP(void);
 
   // Memory Types
   enum mem_type {
diff --git a/src/vscp/common/vscp-client-base.h b/src/vscp/common/vscp-client-base.h
index 7ca5fba72..9b7a47586 100644
--- a/src/vscp/common/vscp-client-base.h
+++ b/src/vscp/common/vscp-client-base.h
@@ -55,7 +55,7 @@ class CVscpClient {
 
 public:
   CVscpClient();
-  ~CVscpClient();
+  virtual ~CVscpClient();
 
   /*!
       vscp-client class types
@@ -78,15 +78,12 @@ class CVscpClient {
     NONE = 0,
     TCPIP,
     CANAL,
-    LEVEL2,
     SOCKETCAN,
     WS1,
     WS2,
     MQTT,
     UDP,
     MULTICAST,
-    RAWCAN,
-    RAWMQTT
   } connType;
 
   /*!
diff --git a/src/vscp/common/vscp-client-canal.h b/src/vscp/common/vscp-client-canal.h
index b2aa81d60..fef2c87a4 100644
--- a/src/vscp/common/vscp-client-canal.h
+++ b/src/vscp/common/vscp-client-canal.h
@@ -39,7 +39,7 @@ class vscpClientCanal : public CVscpClient {
 
 public:
   vscpClientCanal();
-  ~vscpClientCanal();
+  virtual ~vscpClientCanal();
 
   /*!
       Initialize the CANAL client
diff --git a/src/vscp/common/vscp-client-level2.h b/src/vscp/common/vscp-client-level2.h
index f2c62f74c..9bb93c483 100644
--- a/src/vscp/common/vscp-client-level2.h
+++ b/src/vscp/common/vscp-client-level2.h
@@ -40,8 +40,8 @@
 class vscpClientLevel2 : public CVscpClient {
 
 public:
-  vscpClientLevel2();
-  ~vscpClientLevel2();
+  virtual vscpClientLevel2();
+  virtual ~vscpClientLevel2();
 
   static const uint32_t FLAG_ENABLE_DEBUG = 0x80000000; // Debug mode
 
diff --git a/src/vscp/common/vscp-client-mqtt.h b/src/vscp/common/vscp-client-mqtt.h
index 99b3a5db7..85429852a 100644
--- a/src/vscp/common/vscp-client-mqtt.h
+++ b/src/vscp/common/vscp-client-mqtt.h
@@ -208,7 +208,7 @@ class publishTopic {
 #else
   publishTopic(const std::string &topic, enumMqttMsgFormat format = jsonfmt, int qos = 0, bool bretain = false);
 #endif
-  ~publishTopic();
+  virtual ~publishTopic();
 
   /// Getters/Setters for topic
   std::string getTopic(void) { return m_topic; };
diff --git a/src/vscp/common/vscp-client-multicast.h b/src/vscp/common/vscp-client-multicast.h
index f2ae587ac..7f6f8ecf9 100644
--- a/src/vscp/common/vscp-client-multicast.h
+++ b/src/vscp/common/vscp-client-multicast.h
@@ -33,7 +33,7 @@ class vscpClientMulticast : public CVscpClient {
 
 public:
   vscpClientMulticast();
-  ~vscpClientMulticast();
+  virtual ~vscpClientMulticast();
 
   /*!
       Connect to remote host
diff --git a/src/vscp/common/vscp-client-socketcan.h b/src/vscp/common/vscp-client-socketcan.h
index 15fb1ff2c..84e06026a 100644
--- a/src/vscp/common/vscp-client-socketcan.h
+++ b/src/vscp/common/vscp-client-socketcan.h
@@ -74,7 +74,7 @@ class vscpClientSocketCan : public CVscpClient {
 
 public:
   vscpClientSocketCan();
-  ~vscpClientSocketCan();
+  virtual ~vscpClientSocketCan();
 
   // Socketcan flags
   const u_int32_t sockletcan_flag_fd_enable = 0x00008000; // FD frames will be handled
diff --git a/src/vscp/common/vscp-client-tcp.h b/src/vscp/common/vscp-client-tcp.h
index fd672f580..af59e9593 100644
--- a/src/vscp/common/vscp-client-tcp.h
+++ b/src/vscp/common/vscp-client-tcp.h
@@ -36,7 +36,7 @@ class vscpClientTcp : public CVscpClient {
 
 public:
   vscpClientTcp();
-  ~vscpClientTcp();
+  virtual ~vscpClientTcp();
 
   /*!
       Initialize the tcp client
diff --git a/src/vscp/common/vscp-client-udp.h b/src/vscp/common/vscp-client-udp.h
index 8d7bb592c..20a435399 100644
--- a/src/vscp/common/vscp-client-udp.h
+++ b/src/vscp/common/vscp-client-udp.h
@@ -33,7 +33,7 @@ class vscpClientUdp : public CVscpClient {
 
 public:
   vscpClientUdp();
-  ~vscpClientUdp();
+  virtual ~vscpClientUdp();
 
   /*!
       Connect to remote host
diff --git a/src/vscp/common/vscp-client-ws1.h b/src/vscp/common/vscp-client-ws1.h
index 8a9648d24..dbc15d7cb 100644
--- a/src/vscp/common/vscp-client-ws1.h
+++ b/src/vscp/common/vscp-client-ws1.h
@@ -45,7 +45,7 @@ class vscpClientWs1 : public CVscpClient {
 
 public:
   vscpClientWs1();
-  ~vscpClientWs1();
+  virtual ~vscpClientWs1();
 
   /*!
       Init client
diff --git a/src/vscp/common/vscp-client-ws2.h b/src/vscp/common/vscp-client-ws2.h
index 0e50a8d5f..685ee2426 100644
--- a/src/vscp/common/vscp-client-ws2.h
+++ b/src/vscp/common/vscp-client-ws2.h
@@ -45,7 +45,7 @@ class vscpClientWs2 : public CVscpClient {
 
 public:
   vscpClientWs2();
-  ~vscpClientWs2();
+  virtual ~vscpClientWs2();
 
   /*!
       Init client