Added back a couple of needed lines in the setup script