Fixed issues with waypoint scale