Fix support for NativeImage