Bug fixes. All DFS-related CLI commands working.