Fixing clang problems