Progress towards fixing broken data uploads