Fixes to bookmarks