Fix more Config vs. config issues.