Minor changes to accommodate the route calculation service...