further clang fixes