Pipeline implementation fixes