Some updates, to compile with clang.