Fixing more config change fallout.