diff --git a/src/MNH/ini_nsv.f90 b/src/MNH/ini_nsv.f90
index 2553d8ac8cd210470e3ae2b1af741a4eb36ab1d5..8f1da03c448a18c27de445bd0bd347e298e29c06 100644
--- a/src/MNH/ini_nsv.f90
+++ b/src/MNH/ini_nsv.f90
@@ -821,17 +821,23 @@ DO JSV = NSV_LIMA_BEG_A(KMI), NSV_LIMA_END_A(KMI)
     CSVNAMES_A(JSV,KMI) = TRIM( CAERO_MASS(1) )
   ELSE IF ( JSV == NSV_LIMA_NI_A(KMI) ) THEN
     CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(1) )
+  ELSE IF ( JSV == NSV_LIMA_NS_A(KMI) ) THEN
+    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(2) )
+  ELSE IF ( JSV == NSV_LIMA_NG_A(KMI) ) THEN
+    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(3) )
+  ELSE IF ( JSV == NSV_LIMA_NH_A(KMI) ) THEN
+    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(4) )
   ELSE IF ( JSV >= NSV_LIMA_IFN_FREE_A(KMI) .AND. JSV < NSV_LIMA_IFN_NUCL_A(KMI) ) THEN
     WRITE( YNUM2, '( I2.2 )' ) JSV - NSV_LIMA_IFN_FREE_A(KMI) + 1
-    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(2) ) // YNUM2
+    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(5) ) // YNUM2
   ELSE IF ( JSV >= NSV_LIMA_IFN_NUCL_A(KMI) .AND. JSV < ( NSV_LIMA_IFN_NUCL_A(KMI) + NMOD_IFN ) ) THEN
     WRITE( YNUM2, '( I2.2 )' ) JSV - NSV_LIMA_IFN_NUCL_A(KMI) + 1
-    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(3) ) // YNUM2
+    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(6) ) // YNUM2
   ELSE IF ( JSV >= NSV_LIMA_IMM_NUCL_A(KMI) .AND. JSV < ( NSV_LIMA_IMM_NUCL_A(KMI) + NMOD_IMM ) ) THEN
     WRITE( YNUM2, '( I2.2 )' ) NINDICE_CCN_IMM(JSV-NSV_LIMA_IMM_NUCL_A(KMI)+1)
-    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(4) ) // YNUM2
+    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(7) ) // YNUM2
   ELSE IF ( JSV == NSV_LIMA_HOM_HAZE_A(KMI) ) THEN
-    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(5) )
+    CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(8) )
   ELSE IF ( JSV == NSV_LIMA_SPRO_A(KMI) ) THEN
     CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_WARM_NAMES(5) )
   ELSE
diff --git a/src/MNH/lima.f90 b/src/MNH/lima.f90
index 6a667342309472540f3146935933e4cc69cf14fd..2437451e8ac56558dc265834d0d91054026096ff 100644
--- a/src/MNH/lima.f90
+++ b/src/MNH/lima.f90
@@ -1701,6 +1701,7 @@ DO WHILE(ANY(ZTIME(IIB:IIE,IJB:IJE,IKTB:IKTE)<PTSTEP))
       DEALLOCATE(Z_RR_ACC) 
       DEALLOCATE(Z_CR_ACC) 
       DEALLOCATE(Z_RS_ACC) 
+      DEALLOCATE(Z_CS_ACC) 
       DEALLOCATE(Z_RG_ACC)  
       DEALLOCATE(Z_CS_CMEL) 
       DEALLOCATE(Z_RS_CMEL) 
diff --git a/src/MNH/lima_tendencies.f90 b/src/MNH/lima_tendencies.f90
index 19bc49ec6a6339e2423ee854f32841a129d33c04..ea5acd4c97fde650b8ccea1dbbf21713784f0c9e 100644
--- a/src/MNH/lima_tendencies.f90
+++ b/src/MNH/lima_tendencies.f90
@@ -322,6 +322,7 @@ USE MODI_LIMA_COLLISIONAL_ICE_BREAKUP
 USE MODI_LIMA_RAINDROP_SHATTERING_FREEZING
 USE MODI_LIMA_GRAUPEL
 USE MODI_LIMA_HAIL_DEPOSITION
+USE MODI_LIMA_HAIL
 !
 USE MODI_LIMA_BERGERON
 !
@@ -686,7 +687,9 @@ IF (NMOM_S.EQ.1) THEN
       PCST(:) = XCCS * ZLBDS(:)**XCXS / PRHODREF(:)
    END IF
 ELSE
-   ZLBDS(:) = (XLBS*PCST(:)/ZRST(:))**XLBEXS
+   WHERE (ZRST(:)>XRTMIN(5) .AND. PCST(:)>XCTMIN(5) .AND. LDCOMPUTE(:))
+      ZLBDS(:) = (XLBS*PCST(:)/ZRST(:))**XLBEXS
+   END WHERE
 END IF
 ZLBDS3(:) = ZLBDS(:)**3.
 !
@@ -698,7 +701,9 @@ IF (NMOM_G.EQ.1) THEN
    END WHERE
       PCGT(:) = XCCG * ZLBDG(:)**XCXG / PRHODREF(:)
 ELSE
-   ZLBDG(:) = (XLBG*PCGT(:)/ZRGT(:))**XLBEXG
+   WHERE (ZRGT(:)>XRTMIN(6) .AND. PCGT(:)>XCTMIN(6) .AND. LDCOMPUTE(:))
+      ZLBDG(:) = (XLBG*PCGT(:)/ZRGT(:))**XLBEXG
+   END WHERE
 END IF
 !
 ! Hail
@@ -709,7 +714,9 @@ IF (NMOM_H.EQ.1) THEN
       PCHT(:) = XCCH * ZLBDH(:)**XCXH / PRHODREF(:)
    END WHERE
 ELSE
-   ZLBDH(:) = (XLBH*PCHT(:)/ZRHT(:))**XLBEXH
+   WHERE (ZRHT(:)>XRTMIN(7) .AND. PCHT(:)>XCTMIN(7) .AND. LDCOMPUTE(:))
+      ZLBDH(:) = (XLBH*PCHT(:)/ZRHT(:))**XLBEXH
+   END WHERE
 END IF
 !
 !-------------------------------------------------------------------------------