Further fixes to cursor