Fixes to option streaming