Further config tweaks