Fixed a bit more on the StreamBinding front