Corrections to setup script