Tweaks to config and scripts