Backport fixes to nullfs delays