Minor improvement to the setup script