Some config tweaks