more bond fixes