More fixes for image updating and creation