Some fixes to function calls to render the itinerary