ndp: more fixes