Tweaks with image handling.