Fixes for image and container removal