clang fixes