Some config changes to make Herkou happier