Fixing more image issues