Update NHMLFixup (add support for CFR fixing)