Further tweaks to reflect pipeline changes