More image fixes