Assorted fixes for Clang toolchains