Tweaks to image size generation handling