Fix some issues.