NBIA 774, 776, 797 and 799 Fix.