Fix up configuration