More fixes in EstabData.xsd: Armaments and SpeedData