diff --git a/TESTS/usb_device/basic/USBTester.cpp b/TESTS/usb_device/basic/USBTester.cpp
index fa48411560..4a62b91f0c 100644
--- a/TESTS/usb_device/basic/USBTester.cpp
+++ b/TESTS/usb_device/basic/USBTester.cpp
@@ -41,8 +41,9 @@
 
 
 USBTester::USBTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint16_t product_release):
-                        USBDevice(phy, vendor_id, product_id, product_release), reset_count(0), suspend_count(0),
-                        resume_count(0), interface_0_alt_set(NONE), interface_1_alt_set(NONE), configuration_set(NONE)
+                        USBDevice(phy, vendor_id, product_id, product_release), interface_0_alt_set(NONE),
+                        interface_1_alt_set(NONE), configuration_set(NONE), reset_count(0),
+                        suspend_count(0), resume_count(0)
 {
 
     EndpointResolver resolver(endpoint_table());
diff --git a/TESTS/usb_device/basic/USBTester.h b/TESTS/usb_device/basic/USBTester.h
index 5cae22ac2b..1f9349387e 100644
--- a/TESTS/usb_device/basic/USBTester.h
+++ b/TESTS/usb_device/basic/USBTester.h
@@ -38,7 +38,7 @@ public:
     */
     USBTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint16_t product_release);
 
-    ~USBTester();
+    virtual ~USBTester();
 
     /*
     *
diff --git a/usb/device/USBAudio/USBAudio.cpp b/usb/device/USBAudio/USBAudio.cpp
index dfd04ced26..abd899ab45 100644
--- a/usb/device/USBAudio/USBAudio.cpp
+++ b/usb/device/USBAudio/USBAudio.cpp
@@ -342,7 +342,7 @@ float USBAudio::get_volume()
 {
     lock();
 
-    float ret = _mute ? 0.0 : _volume;
+    float ret = _mute ? 0.0f : _volume;
 
     unlock();
     return ret;
diff --git a/usb/device/USBDevice/EndpointResolver.cpp b/usb/device/USBDevice/EndpointResolver.cpp
index ad45006bb2..e06b892960 100644
--- a/usb/device/USBDevice/EndpointResolver.cpp
+++ b/usb/device/USBDevice/EndpointResolver.cpp
@@ -122,7 +122,7 @@ int EndpointResolver::next_index(usb_ep_type_t type, bool in_not_out)
             continue;
         }
 
-        if (shared && (1 << other)) {
+        if (shared && (_used & (1 << other))) {
             // This endpoint can only be one direction at a time and is in
             // use by the other direction
             continue;
diff --git a/usb/device/USBHID/USBHID.cpp b/usb/device/USBHID/USBHID.cpp
index 8045459f16..14bc74ee06 100644
--- a/usb/device/USBHID/USBHID.cpp
+++ b/usb/device/USBHID/USBHID.cpp
@@ -26,7 +26,7 @@ public:
 
     }
 
-    ~AsyncSend()
+    virtual ~AsyncSend()
     {
 
     }
@@ -58,7 +58,7 @@ public:
 
     }
 
-    ~AsyncRead()
+    virtual ~AsyncRead()
     {
 
     }
@@ -90,7 +90,7 @@ public:
 
     }
 
-    ~AsyncWait()
+    virtual ~AsyncWait()
     {
 
     }