diff --git a/PhysicsTools/BPHNano/plugins/MuonTriggerSelector.cc b/PhysicsTools/BPHNano/plugins/MuonTriggerSelector.cc
index 5bbae304d871..9f38bd799616 100644
--- a/PhysicsTools/BPHNano/plugins/MuonTriggerSelector.cc
+++ b/PhysicsTools/BPHNano/plugins/MuonTriggerSelector.cc
@@ -42,7 +42,7 @@ public:
 
 private:
 
-  virtual void produce(edm::Event&, const edm::EventSetup&);
+  void produce(edm::Event&, const edm::EventSetup&) override;
   const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> bFieldToken_;
   edm::EDGetTokenT<std::vector<pat::Muon>> muonSrc_;
   edm::EDGetTokenT<edm::TriggerResults> triggerBits_;
@@ -127,9 +127,9 @@ void MuonTriggerSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSe
       char cstr[ (path + "*").size() + 1];
       strcpy( cstr, (path + "*").c_str() );
       //Here we find all the HLT objects from each HLT path each time that are matched with the reco muon.
-      if (muon.triggerObjectMatches().size() != 0) {
+      if (!muon.triggerObjectMatches().empty()) {
         for (size_t i = 0; i < muon.triggerObjectMatches().size(); i++) {
-          if (muon.triggerObjectMatch(i) != 0 && muon.triggerObjectMatch(i)->hasPathName(cstr, true, true)) {
+          if (muon.triggerObjectMatch(i) != nullptr && muon.triggerObjectMatch(i)->hasPathName(cstr, true, true)) {
             frs[ipath] = 1;
             float dr=deltaR(muon.eta(),muon.phi(),muon.triggerObjectMatch(i)->eta(),muon.triggerObjectMatch(i)->phi());
 	    float dpt = (muon.triggerObjectMatch(i)->pt() - muon.pt()) / muon.triggerObjectMatch(i)->pt();
diff --git a/PhysicsTools/BPHNano/plugins/helper.h b/PhysicsTools/BPHNano/plugins/helper.h
index 5d05906cd2ef..d02fc5ec2c4a 100644
--- a/PhysicsTools/BPHNano/plugins/helper.h
+++ b/PhysicsTools/BPHNano/plugins/helper.h
@@ -86,7 +86,7 @@ inline float CosA(GlobalPoint & dist, ROOT::Math::LorentzVector<ROOT::Math::PxPy
 {
   math::XYZVector vperp(dist.x(), dist.y(), 0);
   math::XYZVector pperp(Bp4.Px(), Bp4.Py(), 0);
-  return std::move(vperp.Dot(pperp) / (vperp.R() * pperp.R()));
+  return vperp.Dot(pperp) / (vperp.R() * pperp.R());
 }