diff --git a/setup.py b/setup.py
index a3beadb954..28d465249c 100644
--- a/setup.py
+++ b/setup.py
@@ -169,7 +169,7 @@ if __name__ == '__main__':
   http://%s.kovidgoyal.net
 
   For source code access:
-  bzr branch %s
+  bzr branch lp:%s
 
   To update your copy of the source code:
   bzr merge
diff --git a/src/calibre/devices/jetbook/driver.py b/src/calibre/devices/jetbook/driver.py
index 2af1b03bf7..9e91f4cfa9 100644
--- a/src/calibre/devices/jetbook/driver.py
+++ b/src/calibre/devices/jetbook/driver.py
@@ -28,16 +28,16 @@ class JETBOOK(USBMS):
 
     VENDOR_NAME      = 'LINUX'
     WINDOWS_MAIN_MEM = 'EBOOK'
-    WINDOWS_CARD_MEM = 'EBOOK'
+    WINDOWS_CARD_A_MEM = 'EBOOK'
 
     OSX_MAIN_MEM = None
-    OSX_CARD_MEM = None
+    OSX_CARD_A_MEM = None
 
     MAIN_MEMORY_VOLUME_LABEL  = 'Jetbook Main Memory'
     STORAGE_CARD_VOLUME_LABEL = 'Jetbook Storage Card'
 
     EBOOK_DIR_MAIN = "Books"
-    EBOOK_DIR_CARD = "Books"
+    EBOOK_DIR_CARD_A = "Books"
     SUPPORTS_SUB_DIRS = True
 
     JETBOOK_FILE_NAME_PATTERN = re.compile(
diff --git a/src/calibre/trac/plugins/Changelog.py b/src/calibre/trac/plugins/Changelog.py
index 774452c447..146d8b16d0 100644
--- a/src/calibre/trac/plugins/Changelog.py
+++ b/src/calibre/trac/plugins/Changelog.py
@@ -48,7 +48,7 @@ class ChangelogFormatter(blog.LogFormatter):
         txt = ['= Changelog =\n[[PageOutline]]']
         for entry in self.entries:
             txt.append(u'----\n== Version '+entry[0]+' ==')
-            if entry[0] == '0.6.0':
+            if entry[0].strip().startswith('0.6.0'):
                 txt.append(u'For a list of new features in 0.6.0 see http://calibre.kovidgoyal.net/new_in_6')
             else:
                 for msg in entry[1]: