Fixes for connectivity

Change-Id: I4be518f26174e3b2b0ded95879f88eca915d3d39