More fixes for new ILMBase/OpenEXR 2.1