[FileMap] Small fixes.