Uploads management and fixes