Build SHM network fixes