Tools and ImageAPI fixes