Fixed a few issues with pipes