Minor fixes to nmo executable