updates to compile with clang++