Bonding mode fixes