fix some brokenness