Tweaking some things in Image class