More clang fixes.