Fixing few bugs on network process

Change-Id: I0a424ca01061f76b8b880215005200b3aba37df5