fix some issue.

fyi.