some fixes in pair, peer check