Fixes for new passenger based setup