More improvements to image handling