Small improvement to Streams/access tool