diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 675f9d790817a6c2a0bf5e0037a562577192f8e0..4b59e17dbf2058581cd6d69d672a4f4b9e04bc5d 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1541,6 +1541,11 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
     m_GOPList[0].m_deltaRefPics1[2] = 3;
     m_GOPList[0].m_deltaRefPics1[3] = 4;
 
+    m_BIO  = false;
+    m_DMVR = false;
+    m_SMVD = false;
+
+
     if (m_iGdrFrequency < 0)
       m_iGdrFrequency = 2;
 
diff --git a/source/Lib/EncoderLib/InterSearch.cpp b/source/Lib/EncoderLib/InterSearch.cpp
index 4c08c0abb24b81078308cd99e0f435101905f341..9b381712652552a14cac8c74e4303771d5da7461 100644
--- a/source/Lib/EncoderLib/InterSearch.cpp
+++ b/source/Lib/EncoderLib/InterSearch.cpp
@@ -11002,7 +11002,11 @@ uint32_t InterSearch::xDetermineBestMvp( PredictionUnit& pu, Mv acMvTemp[3], int
       mvpUpdated = true;
     }
   }
+
+#if !GDR_ENABLED  
   CHECK( !mvpUpdated, "xDetermineBestMvp() error" );
+#endif
+
   return minBits;
 }