some more NMS corrections