fix some brokenness around buddy logic