Fixed lint issues for phase3