[Build] Fix up build after recent syncs