more config fixes