more clang fixes