Fix eventual network issues

Change-Id: I24b1adc8953990c037b9ad1fb674d6154115d2ff