Fixes for the image manager