FIX: more NDR fixes