Make it build cleanly with Clang