diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py
index 9983b45105..a1eee6ad15 100644
--- a/src/calibre/devices/prs505/driver.py
+++ b/src/calibre/devices/prs505/driver.py
@@ -35,12 +35,12 @@ class PRS505(CLI, Device):
 
     VENDOR_NAME        = 'SONY'
     WINDOWS_MAIN_MEM   = re.compile('PRS-(505|300)')
-    WINDOWS_CARD_A_MEM = re.compile(r'PRS-(505|300)/\S+:MS')
-    WINDOWS_CARD_B_MEM = re.compile(r'PRS-(505|300)/\S+:SD')
+    WINDOWS_CARD_A_MEM = re.compile(r'PRS-505/\S+:MS')
+    WINDOWS_CARD_B_MEM = re.compile(r'PRS-505/\S+:SD')
 
     OSX_MAIN_MEM   = re.compile(r'Sony PRS-(505|300)/[^:]+ Media')
-    OSX_CARD_A_MEM = re.compile(r'Sony PRS-(505|300)/[^:]+:MS Media')
-    OSX_CARD_B_MEM = re.compile(r'Sony PRS-(505|300)/[^:]+:SD Media')
+    OSX_CARD_A_MEM = re.compile(r'Sony PRS-505/[^:]+:MS Media')
+    OSX_CARD_B_MEM = re.compile(r'Sony PRS-505/[^:]+:SD Media')
 
     MAIN_MEMORY_VOLUME_LABEL  = 'Sony Reader Main Memory'
     STORAGE_CARD_VOLUME_LABEL = 'Sony Reader Storage Card'
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 54607d1d11..81fb4d79fe 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -1703,10 +1703,14 @@ books_series_link      feeds
             ndb = DBThread(dest, None)
             ndb.connect()
             conn = ndb.conn
+            conn.execute('create table temp_sequence(id INTEGER PRIMARY KEY AUTOINCREMENT)')
+            conn.commit()
             conn.executescript(sql)
             conn.commit()
             conn.execute('pragma user_version=%d'%user_version)
             conn.commit()
+            conn.execute('drop table temp_sequence')
+            conn.commit()
             conn.close()
         except:
             if conn is not None: