Minor changes to make 'dump_image_data' run on Trap V1.