Fix LoF critical mapping mistakes