fixes in adv/sub protocol