fix up build after all those cherry-picks