More image fixes.