Bond fixes