Fixes in TripOptions