More pipeline tweaks