More image upload tweaks