Minor mods to ncml module.