Fix config upgrade