Minor pipeline changes