Fixes to peering again