diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 80cf6c11d3bd9676d207e86502257ed9ed0a3c36..52ff9f6ab8e542ac4705811b88aaed8828984461 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -444,6 +444,11 @@ void EncApp::xInitLibCfg()
       m_cEncLib.setSubPicId                                      ( m_subPicId );
     }
   }
+  else
+  {
+    m_cEncLib.setNumSubPics                                      ( 1 );
+    m_cEncLib.setSubPicIdMappingExplicitlySignalledFlag          ( false );
+  }
 
   m_cEncLib.setUseSplitConsOverride                              ( m_SplitConsOverrideEnabledFlag );
   m_cEncLib.setMinQTSizes                                        ( m_uiMinQT );
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 3731b840ec1219b0ae397892145e0cfe1cc6aa0e..a06ba200b0d1b90d96ad56745e3ef6890e216aed 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -2618,7 +2618,7 @@ SPS::SPS()
 , m_maxWidthInLumaSamples     (352)
 , m_maxHeightInLumaSamples    (288)
 #if JVET_Q0119_CLEANUPS
-, m_subPicInfoPresentFlag         (0)
+, m_subPicInfoPresentFlag     (false)
 #else
 , m_subPicPresentFlag         (0)
 #endif
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index f3e3d35a2a46fa200f83f6ce31d4b7baeae534ea..23298bc1cf7d4b4c41d1d70add4fdfa91bd4381d 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1539,6 +1539,27 @@ void EncLib::xInitSPS( SPS& sps, VPS& vps )
     sps.setSubPicTreatedAsPicFlag(m_subPicTreatedAsPicFlag);
     sps.setLoopFilterAcrossSubpicEnabledFlag(m_loopFilterAcrossSubpicEnabledFlag);
     sps.setSubPicIdLen(m_subPicIdLen);
+#if JVET_Q0119_CLEANUPS
+    sps.setSubPicIdMappingExplicitlySignalledFlag(m_subPicIdMappingExplicitlySignalledFlag);
+    if (m_subPicIdMappingExplicitlySignalledFlag)
+    {
+      sps.setSubPicIdMappingInSpsFlag(m_subPicIdMappingInSpsFlag);
+      if (m_subPicIdMappingInSpsFlag)
+      {
+        sps.setSubPicId(m_subPicId);
+      }
+    }
+#else
+    sps.setSubPicIdPresentFlag(m_subPicIdPresentFlag);
+    if (m_subPicIdPresentFlag)
+    {
+      sps.setSubPicIdSignallingPresentFlag(m_subPicIdSignallingPresentFlag);
+      if (m_subPicIdSignallingPresentFlag)
+      {
+        sps.setSubPicId(m_subPicId);
+      }
+    }
+#endif
   }
 #if JVET_Q0044_SLICE_IDX_WITH_SUBPICS
   else   //In that case, there is only one subpicture that contains the whole picture
@@ -1551,27 +1572,11 @@ void EncLib::xInitSPS( SPS& sps, VPS& vps )
     sps.setSubPicTreatedAsPicFlag(0, 1);
     sps.setLoopFilterAcrossSubpicEnabledFlag(0, 0);
     sps.setSubPicIdLen(0);
-  }
-#endif
 #if JVET_Q0119_CLEANUPS
-  sps.setSubPicIdMappingExplicitlySignalledFlag(m_subPicIdMappingExplicitlySignalledFlag);
-  if (m_subPicIdMappingExplicitlySignalledFlag)
-  {
-    sps.setSubPicIdMappingInSpsFlag(m_subPicIdMappingInSpsFlag);
-    if (m_subPicIdMappingInSpsFlag)
-    {
-      sps.setSubPicId(m_subPicId);
-    }
-  }
+    sps.setSubPicIdMappingExplicitlySignalledFlag(false);
 #else
-  sps.setSubPicIdPresentFlag(m_subPicIdPresentFlag);
-  if (m_subPicIdPresentFlag) 
-  {
-    sps.setSubPicIdSignallingPresentFlag(m_subPicIdSignallingPresentFlag);
-    if (m_subPicIdSignallingPresentFlag)
-    {
-      sps.setSubPicId(m_subPicId);
-    }
+    sps.setSubPicIdPresentFlag(false);
+#endif
   }
 #endif
 #if DQ_SDH_SIGNALLING