Fix some pipe rleated brokenness