More config hotfixes.