Fixes/tweaks for the image refactoring: