Shuttle stuff and fixes.