diff --git a/src/lib/ebus/data.h b/src/lib/ebus/data.h
index 41989bb4..671f9f78 100755
--- a/src/lib/ebus/data.h
+++ b/src/lib/ebus/data.h
@@ -426,12 +426,12 @@ class SingleDataField : public DataField {
   size_t getCount(PartType partType = pt_any, const char* fieldName = nullptr) const override;
 
   // @copydoc
-  virtual string getName(ssize_t fieldIndex) const {
+  virtual string getName(ssize_t fieldIndex) const override {
     return isIgnored() || fieldIndex > 0 ? "" : m_name;
   }
 
   // @copydoc
-  virtual const SingleDataField* getField(ssize_t fieldIndex) const {
+  virtual const SingleDataField* getField(ssize_t fieldIndex) const override {
     if (isIgnored() || fieldIndex > 0) {
       return nullptr;
     }
diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp
index 581b46b0..f4693b6e 100755
--- a/src/lib/ebus/test/test_data.cpp
+++ b/src/lib/ebus/test/test_data.cpp
@@ -533,7 +533,7 @@ int main() {
       {"x,,uch,,,,y,,uch,,,,x,,ign,,,,x,,uch,,,,", "41", "1008ffff00", "0426272829", "wIi1"},
       {"x,,uch,,,,y,,uch,,,,z,,ign,,,,x,,uch,,,,", "41", "1008ffff00", "0426272829", "wIi1"},
   };
-  DataFieldTemplates* templates = new DataFieldTemplates();
+  auto templates = new DataFieldTemplates();
   unsigned int lineNo = 0;
   istringstream dummystr("#");
   string errorDescription;
@@ -571,7 +571,7 @@ int main() {
       findIndex = parseSignedInt(flags.substr(flags.find('i')+1).c_str(), 10, 0, 9, &result);
     }
     OutputFormat verbosity = OF_NONE;
-    if (flags.find("v") != string::npos) {
+    if (flags.find('v') != string::npos) {
       verbosity |= OF_NAMES;
     }
     if (flags.find("vv") != string::npos) {