more cursor fixes