small bugfixes due to pairing update.