[CLANG] Updates from analysis