[Traveller] Some fixes.