more pipeline tweaks