More photo upload tweaks