More upload fixes