Some minor fixes to the CFStream on the high level interface