Minor upload fixes