Fix xml schema validation errors