Patch up the configuration with valid settings, Align defaults