diff --git a/paddle/fluid/framework/details/computation_op_handle.cc b/paddle/fluid/framework/details/computation_op_handle.cc
index 2bf43fd4e0f091d41f81d275b3fd2541d462b8b3..7beb8c8de9fc49aebc66ca44de8736240aabbc30 100644
--- a/paddle/fluid/framework/details/computation_op_handle.cc
+++ b/paddle/fluid/framework/details/computation_op_handle.cc
@@ -31,8 +31,6 @@ ComputationOpHandle::ComputationOpHandle(ir::Node *node, Scope *scope,
 void ComputationOpHandle::RunImpl() {
   WaitInputVarGenerated(place_);
 
-  VLOG(10) << "Run Op" << Name();
-
   auto run_func = [this]() {
     op_->Run(*scope_->FindVar(kLocalExecScopeName)->Get<Scope *>(), place_);
   };
diff --git a/paddle/fluid/framework/details/reference_count_pass.cc b/paddle/fluid/framework/details/reference_count_pass.cc
index 2320d3926ad7fa887d317003bbaba6b8a8d00afa..0c096e09800e3d24aad62944e2bb6ff59187eeb5 100644
--- a/paddle/fluid/framework/details/reference_count_pass.cc
+++ b/paddle/fluid/framework/details/reference_count_pass.cc
@@ -29,7 +29,7 @@ namespace paddle {
 namespace framework {
 namespace details {
 
-struct OpConnectionDetector {
+class OpConnectionDetector {
  public:
   enum RelationShip { kSame = 0, kNoDeps = 1, kBefore = 2, kAfter = 3 };
 
@@ -37,8 +37,8 @@ struct OpConnectionDetector {
       : graph_(all_ops) {}
 
   template <typename OpSet>
-  std::unordered_set<typename OpSet::key_type> MaxNoDepOps(
-      const OpSet &op_set) {
+  OpSet MaxNoDepOps(const OpSet &op_set) {
+    if (op_set.size() <= 1) return op_set;
     using KeyType = typename OpSet::key_type;
     static_assert(
         std::is_base_of<OpHandleBase,
@@ -46,7 +46,7 @@ struct OpConnectionDetector {
         "Key type of OpSet must be or derived of OpHandleBase");
 
     std::vector<OpHandleBase *> ops(op_set.begin(), op_set.end());
-    std::unordered_set<KeyType> ret;
+    OpSet ret;
     auto rels = GetRelations(ops);
     auto not_before = [](RelationShip r) { return r != kBefore; };
     for (size_t i = 0; i < rels.size(); ++i) {
@@ -79,7 +79,7 @@ struct OpConnectionDetector {
       auto it = op_to_idx.find(op);
       if (it != op_to_idx.end()) {
         size_t j = it->second;
-        if (ret[i][j] != kSame) {
+        if (i != j && ret[i][j] == kSame) {
           ret[i][j] = kBefore;
           ret[j][i] = kAfter;
           found_num += 2;
@@ -208,6 +208,10 @@ std::unique_ptr<ir::Graph> ReferenceCountPass::ApplyImpl(
           VLOG(10) << "Shrink last living op number of " << var_name << " from "
                    << original_size << " to " << last_live_op.size();
         }
+
+        PADDLE_ENFORCE(!last_live_op.empty(),
+                       "Last living ops of %s cannot be empty", var_name);
+
         ref_cnts[i].emplace(var_name, last_live_op.size());
         last_live_ops_of_vars[i].emplace(var_name, std::move(last_live_op));
       }
diff --git a/paddle/fluid/platform/stream_callback_manager.cc b/paddle/fluid/platform/stream_callback_manager.cc
index 58ec6f2f5d2b1698136b9b3997149148c09f8db1..466c77469ef256179c52442d21c1d62dfc4ef1bb 100644
--- a/paddle/fluid/platform/stream_callback_manager.cc
+++ b/paddle/fluid/platform/stream_callback_manager.cc
@@ -49,8 +49,6 @@ void StreamCallbackManager::AddCallback(std::function<void()> callback) const {
 #endif
 }
 
-StreamCallbackManager::~StreamCallbackManager() { Wait(); }
-
 void StreamCallbackManager::Wait() const {
   PADDLE_ENFORCE(cudaStreamSynchronize(stream_));
   {
diff --git a/paddle/fluid/platform/stream_callback_manager.h b/paddle/fluid/platform/stream_callback_manager.h
index 0d5d85bf46553eae0371f6691d619359c880958a..8668bcb1131719e882ecbccb08ad00b63409eb28 100644
--- a/paddle/fluid/platform/stream_callback_manager.h
+++ b/paddle/fluid/platform/stream_callback_manager.h
@@ -33,7 +33,7 @@ class StreamCallbackManager {
  public:
   explicit StreamCallbackManager(const cudaStream_t stream);
 
-  ~StreamCallbackManager();
+  ~StreamCallbackManager() = default;
 
   void AddCallback(std::function<void()> callback) const;