diff --git a/core/meta/src/TIsAProxy.cxx b/core/meta/src/TIsAProxy.cxx
index b7a82c5d3fb0a584a06580cd4291babcc170d29c..55b463452d929d5815df3ac9c02880bb215c7ea9 100644
--- a/core/meta/src/TIsAProxy.cxx
+++ b/core/meta/src/TIsAProxy.cxx
@@ -135,7 +135,7 @@ TClass* TIsAProxy::operator()(const void *obj)
    }
    fLasts[next].store(last);
 
-   return last == nullptr ? nullptr : last->second;
+   return last ? last->second : nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/io/io/src/TBufferMerger.cxx b/io/io/src/TBufferMerger.cxx
index e53ca46a11c48e04bb77b7efb5907f1c4a5ebbeb..7575e45f85df8e09b76273d6c9fe4c5eede0e6c7 100644
--- a/io/io/src/TBufferMerger.cxx
+++ b/io/io/src/TBufferMerger.cxx
@@ -50,8 +50,7 @@ TBufferMerger::~TBufferMerger()
    if (!fQueue.empty())
       Merge();
 
-   TFile *out = fMerger.GetOutputFile();
-   if (out)
+   if (TFile *out = fMerger.GetOutputFile())
       out->Write("",TObject::kOverwrite);
 }
 
@@ -132,18 +131,14 @@ void TBufferMerger::MergeImpl()
 
 bool TBufferMerger::TryMerge(ROOT::Experimental::TBufferMergerFile *memfile)
 {
-   if (fMergeMutex.try_lock())
-   {
+   if (fMergeMutex.try_lock()) {
       memfile->WriteStreamerInfo();
       fMerger.AddFile(memfile);
       MergeImpl();
       fMergeMutex.unlock();
       return true;
    } else
-   {
       return false;
-   }
-
 }
 
 } // namespace Experimental
diff --git a/tree/tree/src/TTreeCloner.cxx b/tree/tree/src/TTreeCloner.cxx
index 34f0662081d1322f8d0413c01b92b971e9e4fe4e..a98260612af21aa79fe38271a81d3117e97944dc 100644
--- a/tree/tree/src/TTreeCloner.cxx
+++ b/tree/tree/src/TTreeCloner.cxx
@@ -740,10 +740,11 @@ void TTreeCloner::WriteBaskets()
             if (fFileCache && j >= notCached) {
                notCached = FillCache(notCached);
             }
-            if (from->GetBasketBytes()[index] == 0) {
-               from->GetBasketBytes()[index] = basket->ReadBasketBytes(pos, fromfile);
-            }
             Int_t len = from->GetBasketBytes()[index];
+            if (len == 0) {
+               len = basket->ReadBasketBytes(pos, fromfile);
+               from->GetBasketBytes()[index] = len;
+            }
 
             basket->LoadBasketBuffers(pos,len,fromfile,fFromTree);
             basket->IncrementPidOffset(fPidOffset);