Attempting to fix clang errors