Some XML validation issues fixed