Some xsd validation template fixes