Fix up merges
Fix up build breaks.