Small config fixes