Fix problems with bookmarks