Some fixes to bonding, tested now.