More fixes for the cursor