diff --git a/tensorflow/compiler/mlir/xla/BUILD b/tensorflow/compiler/mlir/xla/BUILD
index b888cf43c40..202a547cf29 100644
--- a/tensorflow/compiler/mlir/xla/BUILD
+++ b/tensorflow/compiler/mlir/xla/BUILD
@@ -121,7 +121,6 @@ cc_library(
         ":legalize_utils",
         ":tf_xla_passes_inc_gen",
         ":xla_legalize_tf_passes_inc_gen",
-        ":xla_passes_inc_gen",
         "//tensorflow/compiler/mlir/tensorflow",
         "//tensorflow/compiler/mlir/tensorflow:dynamic_shape_utils",
         "//tensorflow/compiler/xla:xla_data_proto_cc",
diff --git a/tensorflow/compiler/xla/mlir_hlo/mhlo/transforms/map_mhlo_to_scalar_op.h b/tensorflow/compiler/xla/mlir_hlo/mhlo/transforms/map_mhlo_to_scalar_op.h
index 7e59059449a..c8fba858d72 100644
--- a/tensorflow/compiler/xla/mlir_hlo/mhlo/transforms/map_mhlo_to_scalar_op.h
+++ b/tensorflow/compiler/xla/mlir_hlo/mhlo/transforms/map_mhlo_to_scalar_op.h
@@ -632,7 +632,7 @@ inline Value mapConvertOpToStdScalarOp(Location loc, ArrayRef<Type> targetTypes,
                               loc, llvm::makeArrayRef(int_types), args)
                              .getResults();
     return b->create<mlir::arith::UIToFPOp>(loc, resultTypes, converted_arg,
-                                            mlir::None);
+                                            llvm::None);
     // End of Added by DISC
   }
   if (mlir::arith::SIToFPOp::areCastCompatible(sourceType, targetType)) {
diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl
index 85ef343e3ed..171314ad794 100644
--- a/tensorflow/workspace2.bzl
+++ b/tensorflow/workspace2.bzl
@@ -933,12 +933,12 @@ def _tf_repositories():
         ],
     )
 
-    tf_http_archive(
-        name = "iree-dialects",
-        sha256 = "f6ed70146b85d27c25cb4653cfb879d7954be426516b1cac230cbf5bb8b041da",
-        strip_prefix = "iree-7cd0a8cb6e1027188faa75b9361c4b10aab4707c/llvm-external-projects/iree-dialects",
-        urls = tf_mirror_urls("https://github.com/iree-org/iree/archive/7cd0a8cb6e1027188faa75b9361c4b10aab4707c.zip"),
-    )
+    #tf_http_archive(
+    #    name = "iree-dialects",
+    #    sha256 = "f6ed70146b85d27c25cb4653cfb879d7954be426516b1cac230cbf5bb8b041da",
+    #    strip_prefix = "iree-7cd0a8cb6e1027188faa75b9361c4b10aab4707c/llvm-external-projects/iree-dialects",
+    #    urls = tf_mirror_urls("https://github.com/iree-org/iree/archive/7cd0a8cb6e1027188faa75b9361c4b10aab4707c.zip"),
+    #)
 
     # used for adding androidx.annotation dependencies in tflite android jni.
     maven_install(