Made a few minor fixes to the NTF