More clang fixes