Small changes mostly around Writing to Collection Streams