Some small config tweaks