fix some minor issue.