A few config fixes