Updates to image management for 3.4