Fix build break and tools issue.