some more cursor cleanups