Tweaks to initial setup script.