Tweaks to Config module