Further work on machine launch configs