staging upload fixes