diff --git a/src/atom_standard.cpp b/src/atom_standard.cpp
index ba567fd..a2b1f87 100644
--- a/src/atom_standard.cpp
+++ b/src/atom_standard.cpp
@@ -178,7 +178,7 @@ MP4StandardAtom::MP4StandardAtom (MP4File &file, const char *type) : MP4Atom(fil
         ExpectChildAtom("soco", Optional, OnlyOne); /* sort composer */
         ExpectChildAtom("sosn", Optional, OnlyOne); /* sort show */
         ExpectChildAtom("hdvd", Optional, OnlyOne); /* HD video */
-        ExpectChildAtom("Šenc", Optional, OnlyOne); /* Encoded by */
+        ExpectChildAtom("\251enc", Optional, OnlyOne); /* Encoded by */
         ExpectChildAtom("pcst", Optional, OnlyOne); /* Podcast flag */
         ExpectChildAtom("keyw", Optional, OnlyOne); /* Keywords (for podcasts?) */
         ExpectChildAtom("catg", Optional, OnlyOne); /* Category (for podcasts?) */
diff --git a/src/mp4track.cpp b/src/mp4track.cpp
index 4b8fc9d..42489eb 100644
--- a/src/mp4track.cpp
+++ b/src/mp4track.cpp
@@ -908,16 +908,16 @@ File* MP4Track::GetSampleFile( MP4SampleId sampleId )
        MP4FtypAtom *pFtypAtom = reinterpret_cast<MP4FtypAtom *>( m_File.FindAtom( "ftyp" ) );
 
        // MOV spec does not require "ftyp" atom...
-       if ( pFtypAtom == nullptr )
+       if ( pFtypAtom == NULL )
        {
-          return nullptr;
+          return NULL;
        }
        else
        {
           // ... but most often it is present with a "qt  " value
           const char *majorBrand = pFtypAtom->majorBrand.GetValue();
           if ( ::strcmp( pFtypAtom->majorBrand.GetValue(), "qt  " ) == 0 )
-             return nullptr;
+             return NULL;
        }
        throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ );
     }