diff --git a/hist/unfold/inc/TUnfoldBinning.h b/hist/unfold/inc/TUnfoldBinning.h
index 2384ab90762aa3f9087c83147547239783fc7d8c..db3202e84357a80ee45fc158bb9e4d113875887e 100644
--- a/hist/unfold/inc/TUnfoldBinning.h
+++ b/hist/unfold/inc/TUnfoldBinning.h
@@ -162,7 +162,7 @@ class TUnfoldBinning : public TNamed {
       return (TVectorD const *)fAxisList->At(axis); }
    /// get name of an axis
    inline TString GetDistributionAxisLabel(Int_t axis) const {
-      return ((TObjString * const)fAxisLabelList->At(axis))->GetString(); }
+      return ((TObjString const *)fAxisLabelList->At(axis))->GetString(); }
 
    virtual Double_t GetDistributionUnderflowBinWidth(Int_t axis) const; // width of underflow bin on the given axis
    virtual Double_t GetDistributionOverflowBinWidth(Int_t axis) const; // width of overflow bin on the given axis
diff --git a/hist/unfold/src/TUnfoldBinning.cxx b/hist/unfold/src/TUnfoldBinning.cxx
index 360457ab863942ab225f24fd89b9a8ac223c92bd..3aecbf53c23fdc8539d0c0f58376fc031ff0650e 100644
--- a/hist/unfold/src/TUnfoldBinning.cxx
+++ b/hist/unfold/src/TUnfoldBinning.cxx
@@ -1906,10 +1906,10 @@ Bool_t TUnfoldBinning::HasUnconnectedBins(void) const
 /// \param[in] bin local bin number
 
 const TObjString *TUnfoldBinning::GetUnconnectedBinName(Int_t bin) const {
-   TObjString *r=0;
+   TObjString const *r = nullptr;
    if(HasUnconnectedBins()) {
       if(bin<fAxisLabelList->GetEntriesFast()) {
-         r=((TObjString * const)fAxisLabelList->At(bin));
+         r = ((TObjString const *)fAxisLabelList->At(bin));
       }
    }
    return r;
@@ -2142,7 +2142,7 @@ void TUnfoldBinning::DecodeAxisSteering
      Int_t nPattern=patterns->GetEntries();
      Int_t nAxis=fAxisLabelList->GetEntries();
      for(Int_t i=0;i<nPattern;i++) {
-        TString const &pattern=((TObjString * const)patterns->At(i))
+        TString const &pattern=((TObjString const *)patterns->At(i))
            ->GetString();
         Int_t bracketBegin=pattern.Last('[');
         Int_t len=pattern.Length();