Pipeline fixes