Fixed some issues with multistreaming