More config tweaks