Fix config stuff