Update for clang