Now works builds and works with clang++