Fix the ut issues.