[PATCH 0/7] Fix two bugs in XML schema