Merge "Fix some clang compilation issues."