More config tweakings