diff --git a/libsdrplay/libmirsdrapi-rsp.so b/libsdrplay/x64/libmirsdrapi-rsp.so
similarity index 100%
rename from libsdrplay/libmirsdrapi-rsp.so
rename to libsdrplay/x64/libmirsdrapi-rsp.so
diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.cpp b/plugins/samplesource/sdrplay/sdrplayplugin.cpp
index bde51e6f8..cfae3e62f 100644
--- a/plugins/samplesource/sdrplay/sdrplayplugin.cpp
+++ b/plugins/samplesource/sdrplay/sdrplayplugin.cpp
@@ -93,6 +93,11 @@ PluginInterface::SamplingDevices SDRPlayPlugin::enumSampleSources()
 
     libusb_free_device_list(devs, 1);
 
+    if (usb_context)
+    {
+        libusb_exit(usb_context);
+    }
+
     return result;
 }