Fixes / enhancements related to image deletion in the context of deletion