More Streams
Cleanups
Summit 0.15 compatibility