Fix more clang warnings.