clang build fixes.