[Rover] Fix some bugs