Fix Clang build errors