Further tweaks to setup script