fix some issues: