fix some small issue.