diff --git a/lib/Optimizer/CodeGen/ConvertToQIRAPI.cpp b/lib/Optimizer/CodeGen/ConvertToQIRAPI.cpp
index f267655cf74..bc79b548995 100644
--- a/lib/Optimizer/CodeGen/ConvertToQIRAPI.cpp
+++ b/lib/Optimizer/CodeGen/ConvertToQIRAPI.cpp
@@ -519,11 +519,12 @@ struct MakeStruqOpRewrite : public OpConversionPattern<quake::MakeStruqOp> {
     auto loc = mkstruq.getLoc();
     auto *ctx = rewriter.getContext();
     auto toTy = getTypeConverter()->convertType(mkstruq.getType());
-    Value result = rewriter.create<LLVM::UndefOp>(loc, toTy);
+    Value result = rewriter.create<cudaq::cc::UndefOp>(loc, toTy);
     std::int64_t count = 0;
     for (auto op : adaptor.getOperands()) {
       auto off = DenseI64ArrayAttr::get(ctx, ArrayRef<std::int64_t>{count});
-      result = rewriter.create<LLVM::InsertValueOp>(loc, toTy, result, op, off);
+      result =
+          rewriter.create<cudaq::cc::InsertValueOp>(loc, toTy, result, op, off);
       count++;
     }
     rewriter.replaceOp(mkstruq, result);
diff --git a/lib/Optimizer/Transforms/QuakeAddMetadata.cpp b/lib/Optimizer/Transforms/QuakeAddMetadata.cpp
index eeab81917d6..b31a19100e8 100644
--- a/lib/Optimizer/Transforms/QuakeAddMetadata.cpp
+++ b/lib/Optimizer/Transforms/QuakeAddMetadata.cpp
@@ -132,8 +132,7 @@ struct QuakeFunctionAnalysis {
       keys.pop_back();
       if (isa<cudaq::cc::IfOp, cudaq::cc::ConditionOp, cf::CondBranchOp,
               quake::MeasurementInterface, quake::OperatorInterface,
-              quake::ApplyOp, cudaq::cc::CallCallableOp, func::CallOp,
-              func::CallIndirectOp>(op)) {
+              quake::ApplyOp, CallOpInterface>(op)) {
         data.hasConditionalsOnMeasure = true;
         data.hasQuantumDataflowViaClassical =
             isa<quake::MeasurementInterface, quake::OperatorInterface>(op);