Runtime config fixes