Fix up configuration loading