Mostly fix bulk upload functions sending response before they are finished