Robustness fixes for pipes