Fix MoveCursor function and mapping