Fix the compile issues in UT.