issues with clang++ fixes