fix regressions in the configuration handling