Fix more clang issues.