merge NF fixes from Thomas