diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index 7b154b4935f5b5c2c82dcaa01c5315fa39d9d663..34c4f8aca33423580e50d65e1ed254efa8690c6e 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -1396,7 +1396,7 @@ void activateAPS(PicHeader* picHeader, Slice* pSlice, ParameterSetManager& param
 #if JVET_R0433
       CHECK( sps->getChromaFormatIdc() == CHROMA_400 && lmcsAPS->chromaPresentFlag, "When ChromaArrayType is equal to 0, the value of aps_chroma_present_flag of an LMCS_APS shall be equal to 0");
 
-      CHECK( lmcsAPS->getReshaperAPSInfo().maxNbitsNeededDeltaCW - 1 < 0 || lmcsAPS->getReshaperAPSInfo().maxNbitsNeededDeltaCW - 1 > sps->getBitDepth(CHANNEL_TYPE_LUMA) - 2, "The value of lmcs_delta_cw_prec_minus1 of an LMCS_APS shall be in the range of 0 to BitDepth – 2, inclusive" );
+      CHECK( lmcsAPS->getReshaperAPSInfo().maxNbitsNeededDeltaCW - 1 < 0 || lmcsAPS->getReshaperAPSInfo().maxNbitsNeededDeltaCW - 1 > sps->getBitDepth(CHANNEL_TYPE_LUMA) - 2, "The value of lmcs_delta_cw_prec_minus1 of an LMCS_APS shall be in the range of 0 to BitDepth 2, inclusive" );
 #endif
 
       CHECK( lmcsAPS->getTemporalId() > pSlice->getTLayer(), "TemporalId shall be less than or equal to the TemporalId of the coded slice NAL unit" );
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index e292c7407230e4950e0b3f189ec51558b2c63ca8..3ee87217a43622264d2fa23951d97adc438b1065 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -915,9 +915,9 @@ void HLSyntaxReader::parseAPS( APS* aps )
   aps->setAPSType( ApsType(code) );
 
 #if JVET_R0433
-  uint32_t code_aps_chromaPresentFlag;
-  READ_FLAG(code_aps_chromaPresentFlag, "aps_chroma_present_flag");
-  aps->chromaPresentFlag = code_aps_chromaPresentFlag;
+  uint32_t codeApsChromaPresentFlag;
+  READ_FLAG(codeApsChromaPresentFlag, "aps_chroma_present_flag");
+  aps->chromaPresentFlag = codeApsChromaPresentFlag;
 #endif
 
   if( code == ALF_APS )
@@ -962,7 +962,9 @@ void HLSyntaxReader::parseAlfAps( APS* aps )
 #if JVET_R0433
   }
   else
+  {
     param.newFilterFlag[CHANNEL_TYPE_CHROMA] = 0;
+  }
 #endif
 
   CcAlfFilterParam ccAlfParam = aps->getCcAlfAPSParam();
@@ -975,7 +977,9 @@ void HLSyntaxReader::parseAlfAps( APS* aps )
 #if JVET_R0433
   }
   else
+  {
     ccAlfParam.newCcAlfFilter[COMPONENT_Cb - 1] = 0;
+  }
 #endif
 #if JVET_R0433
   if (aps->chromaPresentFlag)
@@ -986,7 +990,9 @@ void HLSyntaxReader::parseAlfAps( APS* aps )
 #if JVET_R0433
   }
   else
+  {
     ccAlfParam.newCcAlfFilter[COMPONENT_Cr - 1] = 0;
+  }
 #endif
   CHECK(param.newFilterFlag[CHANNEL_TYPE_LUMA] == 0 && param.newFilterFlag[CHANNEL_TYPE_CHROMA] == 0
           && ccAlfParam.newCcAlfFilter[COMPONENT_Cb - 1] == 0 && ccAlfParam.newCcAlfFilter[COMPONENT_Cr - 1] == 0,