diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt
index 207a057d..90997a46 100644
--- a/build_tools/llvm_version.txt
+++ b/build_tools/llvm_version.txt
@@ -1 +1 @@
-676d3bafc09d0c331a04b813804407334de12917
+8598bcb9934dca16ea16d87304e00defc85d986c
diff --git a/lib/Conversion/TosaToEmitC/TosaToEmitC.cpp b/lib/Conversion/TosaToEmitC/TosaToEmitC.cpp
index 8cd30a4c..a5c3ffef 100644
--- a/lib/Conversion/TosaToEmitC/TosaToEmitC.cpp
+++ b/lib/Conversion/TosaToEmitC/TosaToEmitC.cpp
@@ -417,8 +417,7 @@ createBroadcastOpIfNeeded(SrcOp &srcOp, Adaptor adaptor,
   SmallVector<Value> broadcastedOperands;
 
   for (auto operand : adaptor.getOperands()) {
-    RankedTensorType operandTensor =
-        operand.getType().template cast<RankedTensorType>();
+    RankedTensorType operandTensor = cast<RankedTensorType>(operand.getType());
     auto operandShape = operandTensor.getShape();
     auto operandRank = operandTensor.getRank();
 
diff --git a/scripts/requirements.txt b/scripts/requirements.txt
index 4c8f1b11..c8422108 100644
--- a/scripts/requirements.txt
+++ b/scripts/requirements.txt
@@ -1,3 +1,3 @@
-tf-nightly==2.16.0.dev20240207
+tf-nightly==2.18.0.dev20240704
 ml_dtypes==0.3.1
 wrapt==1.14.1
diff --git a/third_party/stablehlo b/third_party/stablehlo
index 52172972..2a6ae6e1 160000
--- a/third_party/stablehlo
+++ b/third_party/stablehlo
@@ -1 +1 @@
-Subproject commit 5217297204acb9e5a21e40fa825aa0769fb3c33f
+Subproject commit 2a6ae6e1d8aac9514cbe393898d383a1d9f8fc9f