Fix Pipe mach backend regressions