Fixes to nf