Minor tweaks to config logic.