Fix up UT build failures after merge