Fixed up couple bugs in Pipeline.