More fixes to setup scripts