#285 Files uploader fixes