Extra config tweaks/restructuring.