More tweaks to config