Changes to make the new config work.