Fix ordering to match prep_spec. And make sure that our full spec is never different.