Fixing clang issues