Several Bookmark related fixes.