Fixing some DFSN bugs.