Segmented upload fixes