Fix issues with piping packets