Corrections to setup scripts