diff --git a/cfg/per-sequence/BasketballPass.cfg b/cfg/per-sequence/BasketballPass.cfg
index c6b756c9423418e82deebceaf0a87ec08e33cf24..8bb123540038dfb0a6265103b256ccf919f9960d 100644
--- a/cfg/per-sequence/BasketballPass.cfg
+++ b/cfg/per-sequence/BasketballPass.cfg
@@ -1,11 +1,11 @@
 #======== File I/O ===============
-InputFile                     : BasketballPass_416x240_50.yuv
+InputFile                     : D:\sequences/BasketballPass_416x240_50.yuv #BasketballPass_416x240_50.yuv
 InputBitDepth                 : 8           # Input bitdepth
 InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
 FrameRate                     : 50          # Frame Rate per second
 FrameSkip                     : 0           # Number of frames to be skipped in input
 SourceWidth                   : 416         # Input  frame width
 SourceHeight                  : 240         # Input  frame height
-FramesToBeEncoded             : 500         # Number of frames to be coded
+FramesToBeEncoded             : 1 #500         # Number of frames to be coded
 
 Level                         : 2.1
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index a51b16f2a4c2dc068eed3ff8b2f09d85ef974140..f6c9c461a50832b1287ed5c4f7900949e5a79e2e 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -3507,7 +3507,9 @@ ParameterSetManager::ParameterSetManager()
 , m_dpsMap(MAX_NUM_DPS)
 #endif
 , m_vpsMap(MAX_NUM_VPS)
+#if !JVET_Q0117_PARAMETER_SETS_CLEANUP
 , m_activeDPSId(-1)
+#endif
 , m_activeSPSId(-1)
 , m_activeVPSId(-1)
 {
@@ -3636,7 +3638,9 @@ bool ParameterSetManager::activatePPS(int ppsId, bool isIRAP)
 
   // Failed to activate if reach here.
   m_activeSPSId=-1;
+#if !JVET_Q0117_PARAMETER_SETS_CLEANUP
   m_activeDPSId=-1;
+#endif
   return false;
 }
 
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index f4303ee086c6de4be748961621b56b0135f55b48..ec07c4ed87d873550f61cd8ef9e9c5b13221ad25 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -3403,8 +3403,9 @@ protected:
   ParameterSetMap<VPS> m_vpsMap;
 
   APS* m_apss[ALF_CTB_MAX_NUM_APS];
-
+#if !JVET_Q0117_PARAMETER_SETS_CLEANUP
   int m_activeDPSId; // -1 for nothing active
+#endif
   int m_activeSPSId; // -1 for nothing active
   int m_activeVPSId; // -1 for nothing active
 };
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index a2d4bff3664d145fba06a770e4a59c0cdeda6d5b..c387899ac65fd9ab952fc1378d5690a3d4eb44fc 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -2156,7 +2156,7 @@ void DecLib::xDecodeDCI(InputNALUnit& nalu)
   DCI* dci = new DCI();
   m_HLSReader.setBitstream(&nalu.getBitstream());
 
-  CHECK(nalu.m_temporalId, "The value of TemporalId of DPS NAL units shall be equal to 0");
+  CHECK(nalu.m_temporalId, "The value of TemporalId of DCI NAL units shall be equal to 0");
 
   m_HLSReader.parseDCI(dci);
 }
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 2b72176d5df0b7701ba0067a18b2bf240df0041f..b161ae83aeaf7a78c24e32542ab3b8def753038e 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -322,7 +322,7 @@ int EncGOP::xWriteDCI(AccessUnit& accessUnit, const DCI* dci)
 {
   OutputNALUnit nalu(NAL_UNIT_DCI);
   m_HLSWriter->setBitstream(&nalu.m_Bitstream);
-  CHECK(nalu.m_temporalId, "The value of TemporalId of DPS NAL units shall be equal to 0");
+  CHECK(nalu.m_temporalId, "The value of TemporalId of DCI NAL units shall be equal to 0");
   m_HLSWriter->codeDCI(dci);
   accessUnit.push_back(new NALUnitEBSP(nalu));
   return (int)(accessUnit.back()->m_nalUnitData.str().size()) * 8;
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 1110d0699b6eff1d40d2e1f0721374e7edc272b7..a919235c1b0d48885b958ab2ed29418def5dd3af 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1481,7 +1481,7 @@ void HLSWriter::codeDCI(const DCI* dci)
     ProfileTierLevel ptl = dci->getProfileTierLevel(i);
     codeProfileTierLevel(&ptl, 0);
   }
-  WRITE_FLAG(0, "dps_extension_flag");
+  WRITE_FLAG(0, "dci_extension_flag");
   xWriteRbspTrailingBits();
 }
 #else