Fixed up the pre-run setup