More config fixes