More image addition fixes