Fixing a couple of bugs in the setup script, renamed