Fixes for launching onto staging areas