CLSN-276: file uploader issues