Stream OT fixes