fix API breakages from recent merges