more ND fixes