Updated to clang complete and temp fixing