Even more config fixes