Some config fixes