Corrected couple of bug in Stream