Changes to compile with clang