Some config fixes.
Some config fixes.