peer discovery fixes