Fixes related to images and their labels