Multiple upload fixes