fixes-for-file-uploads