#50 More pipeline tweaks