diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index c96c9c7e6f97fe76dd6a0840b795a16e9a7072b8..608268974c75dab8202215c97677dc191115f01d 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -660,6 +660,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
 
   bool fieldSeqFlag = getSPS()->getFieldSeqFlag();
 
+#if !JVET_R0041
   int currentPictureIsTrailing = 0;
   if (getPic()->getDecodingOrderNumber() > associatedIRAPDecodingOrderNumber)
   {
@@ -677,6 +678,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
       currentPictureIsTrailing = 1;
     }
   }
+#endif
 
   int layerIdx = m_pcPic->cs->vps == nullptr ? 0 : m_pcPic->cs->vps->getGeneralLayerIdx(m_pcPic->layerId);
 
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index b987325e07ddff8844cecf0f7c2b7c91404840d8..2ffa214f3804d0c5946800131da7c9e63773838f 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -393,16 +393,15 @@ DecLib::DecLib()
   , m_isFirstGeneralHrd(true)
   , m_prevGeneralHrdParams()
 #if JVET_R0041
+  , m_PrevGDRInSameLayerPOC{ 0 }
+  , m_pocCRA{ 0 }
   , m_associatedIRAPDecodingOrderNumber{ 0 }
 #else
   , m_associatedIRAPType(NAL_UNIT_INVALID)
   , m_associatedIRAPDecodingOrderNumber(0)
 #endif
   , m_decodingOrderCounter(0)
-#if JVET_R0041
-  , m_PrevGDRInSameLayerPOC{ 0 }
-  , m_pocCRA{ 0 }
-#else
+#if !JVET_R0041
   , m_pocCRA(0)
 #endif
   , m_pocRandomAccess(MAX_INT)