More fixes to pipelining