Fix bugs in pairing

 WOOT