ImageData fixes