Fixes on Image handling