Fixed some xsd:int/xsd:integer inconsistencies