adjust stuff for recent clang