IMage fixes.