fixups for merge_utils XML packages gen. Previous code didn't work.