Fix for some peering issues