Bug fixing after upgrade to stream base API in networking