Small changes in upload/download