More changes trying to fix kudu exception