Tweaks to reflect new config