Tweaks to setup scripts