Update NHMLFixup to v5.