fix some issues.