Fix config issues noticed in code review