diff --git a/dockerfiles/Dockerfile.cuda b/dockerfiles/Dockerfile.cuda
index a132b7b559..b17bae31cd 100644
--- a/dockerfiles/Dockerfile.cuda
+++ b/dockerfiles/Dockerfile.cuda
@@ -12,7 +12,8 @@ ARG ONNXRUNTIME_REPO=https://github.com/Microsoft/onnxruntime
 ARG ONNXRUNTIME_BRANCH=master
 
 RUN apt-get update &&\
-    apt-get install -y sudo git bash
+    apt-get install -y sudo git bash unattended-upgrades
+RUN unattended-upgrade
 
 WORKDIR /code
 ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/code/cmake-3.14.3-Linux-x86_64/bin:/opt/miniconda/bin:${PATH}
diff --git a/dockerfiles/Dockerfile.tensorrt b/dockerfiles/Dockerfile.tensorrt
index fff01610c5..2ea672c3cb 100644
--- a/dockerfiles/Dockerfile.tensorrt
+++ b/dockerfiles/Dockerfile.tensorrt
@@ -12,7 +12,8 @@ ARG ONNXRUNTIME_REPO=https://github.com/Microsoft/onnxruntime
 ARG ONNXRUNTIME_BRANCH=master
 
 RUN apt-get update &&\
-    apt-get install -y sudo git bash
+    apt-get install -y sudo git bash unattended-upgrades
+RUN unattended-upgrade
 
 WORKDIR /code
 ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/code/cmake-3.14.3-Linux-x86_64/bin:/opt/miniconda/bin:${PATH}
diff --git a/orttraining/orttraining/core/graph/gradient_builder_base.h b/orttraining/orttraining/core/graph/gradient_builder_base.h
index eab707c04b..dcaf7818bc 100644
--- a/orttraining/orttraining/core/graph/gradient_builder_base.h
+++ b/orttraining/orttraining/core/graph/gradient_builder_base.h
@@ -37,7 +37,7 @@ typedef std::vector<NodeDef> GradientDef;
 class GradientBuilderBase {
  public:
   GradientBuilderBase(const GradientGraphConfiguration& gradient_graph_config,
-                      const Graph* graph,
+                      Graph* graph,
                       const Node* node,
                       const std::unordered_set<std::string>& gradient_inputs,
                       const std::unordered_set<std::string>& gradient_outputs,
@@ -217,13 +217,13 @@ class GradientBuilderBase {
     if (!name.empty()) {
       unique_prefix << name << "_Grad/";
     } else {
-      unique_prefix << node_->OpType() << "_" << node_->Index() << "_Grad/";
+      unique_prefix << graph_->GenerateNodeName(node_->OpType()) << "_Grad/";
     }
     return unique_prefix.str();
   }
 
   const GradientGraphConfiguration& gradient_graph_config_;
-  const Graph* graph_;
+  Graph* graph_;
   const Node* node_;
   std::string unique_node_prefix_;
 
diff --git a/orttraining/orttraining/core/graph/gradient_builder_registry.cc b/orttraining/orttraining/core/graph/gradient_builder_registry.cc
index 555be584e3..6cd85c13d2 100644
--- a/orttraining/orttraining/core/graph/gradient_builder_registry.cc
+++ b/orttraining/orttraining/core/graph/gradient_builder_registry.cc
@@ -9,7 +9,7 @@ namespace onnxruntime {
 namespace training {
 
 GradientDef GetGradientForOp(const GradientGraphConfiguration& gradient_graph_config,
-                             const Graph* graph,
+                             Graph* graph,
                              const Node* node,
                              const std::unordered_set<std::string>& output_args_need_grad,
                              const std::unordered_set<std::string>& input_args_need_grad,
diff --git a/orttraining/orttraining/core/graph/gradient_builder_registry.h b/orttraining/orttraining/core/graph/gradient_builder_registry.h
index ba16d878b1..9008d59845 100644
--- a/orttraining/orttraining/core/graph/gradient_builder_registry.h
+++ b/orttraining/orttraining/core/graph/gradient_builder_registry.h
@@ -13,7 +13,7 @@ namespace training {
 
 typedef GenericRegistry<GradientBuilderBase,
                         const GradientGraphConfiguration&,
-                        const Graph*&,                           // graph
+                        Graph*&,                                 // graph
                         const Node*&,                            // node
                         const std::unordered_set<std::string>&,  // gradient_inputs
                         const std::unordered_set<std::string>&,  // gradient_outputs
@@ -35,7 +35,7 @@ class GradientBuilderRegistry : public GradientRegistryType {
 };
 
 GradientDef GetGradientForOp(const GradientGraphConfiguration& gradient_graph_config,
-                             const Graph* graph,
+                             Graph* graph,
                              const Node* node,
                              const std::unordered_set<std::string>& output_args_need_grad,
                              const std::unordered_set<std::string>& input_args_need_grad,