Improve NITF 2.0 handling