some changes to reflect mergexml changes