Tweaks to config