diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 799a67f31b..f3945bedeb 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -71,7 +71,7 @@ def debug_device_driver():
         drives = []
         print 'Drives detected:'
         print '\t', '(ID, Partitions, Drive letter)'
-        for drive in wmi.WMI().Win32_DiskDrive():
+        for drive in wmi.WMI(find_classes=False).Win32_DiskDrive():
             if drive.Partitions == 0:
                 continue
             try:
diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py
index b9bf8443fb..56d34dc0e6 100644
--- a/src/calibre/devices/nook/driver.py
+++ b/src/calibre/devices/nook/driver.py
@@ -31,7 +31,8 @@ class NOOK(USBMS):
 
     #OSX_MAIN_MEM = ''
 
-    MAIN_MEMORY_VOLUME_LABEL  = 'BN Nook Main Memory'
+    MAIN_MEMORY_VOLUME_LABEL  = 'Nook Main Memory'
+    STORAGE_CARD_VOLUME_LABEL = 'Nook Storage Card'
 
     EBOOK_DIR_MAIN = 'my documents'
     SUPPORTS_SUB_DIRS = True
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index 8b18f8ae2e..2c0bcba937 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -209,7 +209,8 @@ class Device(DeviceConfig, DevicePlugin):
         return (msz, casz, cbsz)
 
     def windows_match_device(self, drive, attr):
-        pnp_id = str(drive.PNPDeviceID).upper()
+        pnp_id = (str(drive.PNPDeviceID) if not isinstance(drive, basestring)
+                else str(drive)).upper()
         device_id = getattr(self, attr)
 
         def test_vendor():