Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp	(revision 372)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp	(revision 401)
@@ -185,4 +185,5 @@
 {
   {
+#if !H_MV
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tstate=" )
@@ -191,4 +192,5 @@
     DTRACE_CABAC_V( binValue )
     DTRACE_CABAC_T( "\n" )
+#endif
   }
   m_uiBinsCoded += m_binCountIncrement;
@@ -231,8 +233,10 @@
 {
   {
+#if !H_MV
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tEPsymbol=" )
     DTRACE_CABAC_V( binValue )
     DTRACE_CABAC_T( "\n" )
+#endif
   }
   m_uiBinsCoded += m_binCountIncrement;
@@ -259,8 +263,10 @@
   for ( Int i = 0; i < numBins; i++ )
   {
+#if !H_MV
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tEPsymbol=" )
     DTRACE_CABAC_V( ( binValues >> ( numBins - 1 - i ) ) & 1 )
     DTRACE_CABAC_T( "\n" )
+#endif
   }
   
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 372)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 401)
@@ -799,5 +799,9 @@
       TComReferencePictureSet altRps;
       Bool useAltRps = false;
+#if H_MV
+      if (pcSlice->getRapPicFlag() && ( pcSlice->getLayerId() == 0 ) )
+#else
       if (pcSlice->getRapPicFlag())
+#endif
       {
         for (Int picIdx = 0; !useAltRps && picIdx < rps->getNumberOfPictures(); picIdx++)
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncEntropy.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncEntropy.cpp	(revision 372)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncEntropy.cpp	(revision 401)
@@ -587,8 +587,10 @@
   if( pcCU->isIntra(uiAbsPartIdx) )
   {
+#if !H_MV
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tdecodeTransformIdx()\tCUDepth=" )
     DTRACE_CABAC_V( uiDepth )
     DTRACE_CABAC_T( "\n" )
+#endif
   }
   else
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 372)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 401)
@@ -2846,5 +2846,5 @@
   {
     Int numModifications = 0;
-    
+
     for( Int k = 0; k < ge.m_numInterViewRefPics; k++ ) 
     {
@@ -2853,11 +2853,10 @@
 
     // set inter-view modifications
+    Bool isModified = false;
+    Int tempList[16];
+    for( Int k = 0; k < 16; k++ ) { tempList[k] = -1; }
+
     if( (maxRefListSize > 1) && (numModifications > 0) )
     {
-      refPicListModification->setRefPicListModificationFlagL( li, true );
-      Int tempList[16];
-      for( Int k = 0; k < 16; k++ ) { tempList[k] = -1; }
-
-      Bool isModified = false;
       for( Int k = 0; k < ge.m_numInterViewRefPics; k++ )
       {
@@ -2878,25 +2877,24 @@
         }
       }
-      if( isModified )
-      {
-        Int temporalRefIdx = 0;
-        for( Int i = 0; i < pcSlice->getNumRefIdx( ( li == 0 ) ? REF_PIC_LIST_0 : REF_PIC_LIST_1 ); i++ )
-        {
-          if( tempList[i] >= 0 ) 
-          {
-            refPicListModification->setRefPicSetIdxL( li, i, tempList[i] );
-          }
-          else
-          {
-            refPicListModification->setRefPicSetIdxL( li, i, temporalRefIdx );
-            temporalRefIdx++;
-          }
-        }
-      }
-      else
-      {
-        refPicListModification->setRefPicListModificationFlagL( li, false );
-      }
-    }
+    }
+
+    refPicListModification->setRefPicListModificationFlagL( li, isModified );  
+
+    if( isModified )
+    {
+      Int temporalRefIdx = 0;
+      for( Int i = 0; i < pcSlice->getNumRefIdx( ( li == 0 ) ? REF_PIC_LIST_0 : REF_PIC_LIST_1 ); i++ )
+      {
+        if( tempList[i] >= 0 ) 
+        {
+          refPicListModification->setRefPicSetIdxL( li, i, tempList[i] );
+        }
+        else
+        {
+          refPicListModification->setRefPicSetIdxL( li, i, temporalRefIdx );
+          temporalRefIdx++;
+        }
+      }
+    }    
   }
 }
