Fix up the config system.