Fixing peering bugs