Fixes for bookmarking and bugs caused by new code