tweak ordering of config processing again