fixes for cursors