[FileMap] Small improvements.