Changing config lookups so they accord with the actual config object