another round of config fixes