image management fixes