Some errors fixed caused by autoformat in last commit.