More CompressedStreamTools work