More XSD validation template fixes (pass)