Fixes from trying a brand new walkthrough from scratch
Fixes from trying a brand new walkthrough from scratch

autotelik/datashift_journey,autotelik/datashift_state,autotelik/datashift_journey,autotelik/datashift_journey,autotelik/datashift_state,autotelik/datashift_state,autotelik/datashift_journey