Ndl: corrections to last commit.