Fixed a few bugs with pipelining and embedded flows.