More config fixes (NPE).