More image improvements