Fix some broken imports that resulted from the merge.