Fix Clang build issues