Some quick fixes on notes and bookmarks