Minor updates/fixes to setup scripts