fixing clang issues