some clang complete fixes