Fixes for xml v1 patchsets