NMore fixes