Fixes to more of the bookmark playing