Minor config fixes