Fix some issues: