fix clang++ and g++ builds