Fixed minor XML generation issues.
YAML files for EMI3-14 and EMI2-23 updates.