Minor changes to streams and tools.