Changes in files in order to resolve the uploader problems