More corrections related to inconsistent usage of the Configuration