DFStream minor fixes