Fixes regression issues with travel
Merge pull request #578 from apathyboy/travel_fixes

Fixes regression issues with travel