Fix compile errors post-merge.