Fixes for onboard tickets

Lots of onboard ticket fixes.