Second set of fixes to support networking and ceph