Minor tweaks to files for generating/testing nml2