Initial config tweaks