fixes to Streams/access before merging