Minor changes to match private kudu