File and FileSaver: fixes