Fixed some cursor issues