Some xml namespace fixes/standardization