Fixed cursor issues