Fixed up new config processing