Fixes to bookmarking