Updates to setup scripts