clang build fixes