Make sure stream_ids are set correctly