More image URL fixes