Two issues with pipe stuff fixed (#144 and #153)