Fix up regarding bookmarks.