Fixes to prefix cursors