fixes due to upload event & upload agent