assorted config fixes