Fixups for u_pipe