Fixup ConsoleStream

Several changes to improve ConsoleStream class