fresh upload fixes