More "fixes" to pipe binding...