more upload fixes