Tweak the configuration here and there