Fix config issues