fixes to setup script