Tweak pipe.c and makefile