diff --git a/adts/adtsstream.cpp b/adts/adtsstream.cpp
index 242d4d0..28847cd 100644
--- a/adts/adtsstream.cpp
+++ b/adts/adtsstream.cpp
@@ -33,7 +33,7 @@ void AdtsStream::internalParseHeader()
     m_format = Mpeg4AudioObjectIds::idToMediaFormat(m_firstFrame.mpeg4AudioObjectId());
     m_channelCount = Mpeg4ChannelConfigs::channelCount(m_channelConfig = m_firstFrame.mpeg4ChannelConfig());
     byte sampleRateIndex = m_firstFrame.mpeg4SamplingFrequencyIndex();
-    m_sampleRate = sampleRateIndex < sizeof(mpeg4SampleRateTable) ? mpeg4SampleRateTable[sampleRateIndex] : 0;
+    m_sampleRate = sampleRateIndex < sizeof(mpeg4SamplingFrequencyTable) ? mpeg4SamplingFrequencyTable[sampleRateIndex] : 0;
 }
 
 } // namespace Media
diff --git a/mp4/mp4ids.cpp b/mp4/mp4ids.cpp
index 4000b22..af44ec0 100644
--- a/mp4/mp4ids.cpp
+++ b/mp4/mp4ids.cpp
@@ -279,7 +279,7 @@ LIB_EXPORT MediaFormat idToMediaFormat(byte mpeg4AudioObjectId, bool sbrPresent,
 
 }
 
-uint32 mpeg4SampleRateTable[] = {
+uint32 mpeg4SamplingFrequencyTable[] = {
     96000, 88200, 64000, 48000, 44100, 32000,
     24000, 22050, 16000, 12000, 11025, 8000, 7350
 };
diff --git a/mp4/mp4ids.h b/mp4/mp4ids.h
index 2bcf5d6..7f71b4b 100644
--- a/mp4/mp4ids.h
+++ b/mp4/mp4ids.h
@@ -585,7 +585,7 @@ LIB_EXPORT MediaFormat idToMediaFormat(byte mpeg4AudioObjectId, bool sbrPresent
 
 }
 
-extern uint32 mpeg4SampleRateTable[13];
+extern uint32 mpeg4SamplingFrequencyTable[13];
 
 namespace Mpeg4ChannelConfigs {
 enum Mpeg4ChannelConfig : byte
diff --git a/mp4/mp4tag.cpp b/mp4/mp4tag.cpp
index fdcd3c7..97028f6 100644
--- a/mp4/mp4tag.cpp
+++ b/mp4/mp4tag.cpp
@@ -122,14 +122,10 @@ bool Mp4Tag::setValue(KnownField field, const TagValue &value)
     case KnownField::Genre:
         switch(value.type()) {
         case TagDataType::StandardGenreIndex:
-            if(fields().count(Mp4TagAtomIds::Genre)) {
-                fields().erase(Mp4TagAtomIds::Genre);
-            }
+            fields().erase(Mp4TagAtomIds::Genre);
             return FieldMapBasedTag<fieldType>::setValue(Mp4TagAtomIds::PreDefinedGenre, value);
         default:
-            if(fields().count(Mp4TagAtomIds::PreDefinedGenre)) {
-                fields().erase(Mp4TagAtomIds::PreDefinedGenre);
-            }
+            fields().erase(Mp4TagAtomIds::PreDefinedGenre);
             return FieldMapBasedTag<fieldType>::setValue(Mp4TagAtomIds::Genre, value);
         }
     case KnownField::EncoderSettings:
diff --git a/mp4/mp4track.cpp b/mp4/mp4track.cpp
index 9974c73..5f1cbbd 100644
--- a/mp4/mp4track.cpp
+++ b/mp4/mp4track.cpp
@@ -1366,15 +1366,15 @@ void Mp4Track::internalParseHeader()
                                 m_format += Mpeg4AudioObjectIds::idToMediaFormat(m_esInfo->audioSpecificConfig->audioObjectType, m_esInfo->audioSpecificConfig->sbrPresent, m_esInfo->audioSpecificConfig->psPresent);
                                 if(m_esInfo->audioSpecificConfig->sampleFrequencyIndex == 0xF) {
                                     m_sampleRate = m_esInfo->audioSpecificConfig->sampleFrequency;
-                                } else if(m_esInfo->audioSpecificConfig->sampleFrequencyIndex < sizeof(mpeg4SampleRateTable)) {
-                                    m_sampleRate = mpeg4SampleRateTable[m_esInfo->audioSpecificConfig->sampleFrequencyIndex];
+                                } else if(m_esInfo->audioSpecificConfig->sampleFrequencyIndex < sizeof(mpeg4SamplingFrequencyTable)) {
+                                    m_sampleRate = mpeg4SamplingFrequencyTable[m_esInfo->audioSpecificConfig->sampleFrequencyIndex];
                                 } else {
                                     addNotification(NotificationType::Warning, "Audio specific config has invalid sample frequency index.", context);
                                 }
                                 if(m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex == 0xF) {
                                     m_extensionSampleRate = m_esInfo->audioSpecificConfig->extensionSampleFrequency;
-                                } else if(m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex < sizeof(mpeg4SampleRateTable)) {
-                                    m_extensionSampleRate = mpeg4SampleRateTable[m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex];
+                                } else if(m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex < sizeof(mpeg4SamplingFrequencyTable)) {
+                                    m_extensionSampleRate = mpeg4SamplingFrequencyTable[m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex];
                                 } else {
                                     addNotification(NotificationType::Warning, "Audio specific config has invalid extension sample frequency index.", context);
                                 }
diff --git a/tag.h b/tag.h
index d2efded..44ae7fb 100644
--- a/tag.h
+++ b/tag.h
@@ -135,9 +135,8 @@ protected:
     std::string m_version;
     uint32 m_size;
     TagTarget m_target;
-    Tag *m_parent;
-    std::vector<Tag *> m_nestedTags;
-
+//    Tag *m_parent;
+//    std::vector<Tag *> m_nestedTags;
 };
 
 /*!