Just tidied up the setup_all script slightly more.