fix some issue.
fix some issues