Further config fixes