diff --git a/mp4/mp4tag.cpp b/mp4/mp4tag.cpp
index 51613cb..f7b6658 100644
--- a/mp4/mp4tag.cpp
+++ b/mp4/mp4tag.cpp
@@ -29,6 +29,7 @@ Mp4ExtendedFieldId::Mp4ExtendedFieldId(KnownField field)
     case KnownField::EncoderSettings:
         mean = Mp4TagExtendedMeanIds::iTunes;
         name = Mp4TagExtendedNameIds::cdec;
+        updateOnly = false;
         break;
     case KnownField::RecordLabel:
         mean = Mp4TagExtendedMeanIds::iTunes;
@@ -37,6 +38,8 @@ Mp4ExtendedFieldId::Mp4ExtendedFieldId(KnownField field)
         break;
     default:
         mean = nullptr;
+        name = nullptr;
+        updateOnly = false;
     }
 }
 
diff --git a/ogg/oggiterator.cpp b/ogg/oggiterator.cpp
index ca8b7a9..7a8466f 100644
--- a/ogg/oggiterator.cpp
+++ b/ogg/oggiterator.cpp
@@ -135,18 +135,17 @@ void OggIterator::read(char *buffer, size_t count)
 {
     size_t bytesRead = 0;
     while (*this && count) {
-        const uint32 available = currentSegmentSize() - m_bytesRead;
+        const auto available = currentSegmentSize() - m_bytesRead;
         stream().seekg(static_cast<streamoff>(currentCharacterOffset()));
         if (count <= available) {
             stream().read(buffer + bytesRead, static_cast<streamoff>(count));
             m_bytesRead += count;
             return;
-        } else {
-            stream().read(buffer + bytesRead, available);
-            nextSegment();
-            bytesRead += available;
-            count -= available;
         }
+        stream().read(buffer + bytesRead, available);
+        nextSegment();
+        bytesRead += available;
+        count -= available;
     }
     if (count) {
         // still bytes to read but no more available