Fixed compilation after updated NSIv2 xsd's