Small config tweaks