Fixed dataflow bugs.