Update to latest nml2