Changes to deal with images that no longer exist