A few config tweaks