diff --git a/cfg/nonCTC-SliceConfigExamples/encoder_randomaccess_vtm_RasterScanSlice.cfg b/cfg/nonCTC-SliceConfigExamples/encoder_randomaccess_vtm_RasterScanSlice.cfg
index 1fdd36ba50c9325895e32c1fbde2cee3f43cdbca..b1fbeb3edc65974c4c3a94cfa91578d55c8aa253 100644
--- a/cfg/nonCTC-SliceConfigExamples/encoder_randomaccess_vtm_RasterScanSlice.cfg
+++ b/cfg/nonCTC-SliceConfigExamples/encoder_randomaccess_vtm_RasterScanSlice.cfg
@@ -132,7 +132,6 @@ BCW                          : 1
 BcwFast                      : 1
 BIO                          : 1 
 CIIP                         : 1
-Triangle                     : 1
 IBC                          : 0      # turned off in CTC
 AllowDisFracMMVD             : 1
 AffineAmvr                   : 1
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index a2b9028cc9cafc52181c0125000c9336a510141c..483e813452feb56ddec014552916060cd78e5895 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -3164,7 +3164,10 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
   else 
   {
     CHECK(pps->getCtuSize() != sps->getCTUSize(), "PPS CTU size does not match CTU size in SPS");
-    pps->initRectSliceMap(sps);
+    if (pps->getRectSliceFlag())
+    {
+      pps->initRectSliceMap(sps);
+    }
   }
 
 #if JVET_Q0044_SLICE_IDX_WITH_SUBPICS
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index e7edfffa80a505489f60228de20f1e4770a593fd..f3e3d35a2a46fa200f83f6ce31d4b7baeae534ea 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1877,14 +1877,14 @@ void EncLib::xInitPPS(PPS &pps, const SPS &sps)
       pps.setTileIdxDeltaPresentFlag( m_tileIdxDeltaPresentFlag );
       pps.setRectSlices( m_rectSlices );
       pps.initRectSliceMap(&sps);
-#if JVET_O1143_SUBPIC_BOUNDARY
-      pps.initSubPic(sps);
-#endif
     }
     else
     {
       pps.initRasterSliceMap( m_rasterSliceSize );
     }
+    #if JVET_O1143_SUBPIC_BOUNDARY
+    pps.initSubPic(sps);
+    #endif
     pps.setLoopFilterAcrossTilesEnabledFlag( m_bLFCrossTileBoundaryFlag );
     pps.setLoopFilterAcrossSlicesEnabledFlag( m_bLFCrossSliceBoundaryFlag );
   }