More network traffic fixes

Change-Id: Ib3cecfe51512853d5ac986600b1aed4250214ae2