Fix PR comments and UT