Improvements for the next Image release

[hfield]

Thanks, found that out a few minutes ago :-).