CLS-276: file uploader issues