Fix some issue.