Fixes to cursor