Fix build-break and UT failures