Fix bulk photo uploading fully (except async weirdness)