Cursor improvements.