More Tweaks to Image Handling.