More image path fixes