Trivial clang fixes