diff --git a/driver/src/cosp2_io.f90 b/driver/src/cosp2_io.f90
index 1bfc431bed..eb202a3fcd 100644
--- a/driver/src/cosp2_io.f90
+++ b/driver/src/cosp2_io.f90
@@ -568,7 +568,7 @@ subroutine write_cosp2_output(Npoints, Ncolumns, Nlevels, lev, lon, lat, cospOUT
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))    
     endif
     if (associated(cospOUT%calipso_cldtypemeanz)) then
-       ! Opaque cloud temperature
+       ! Opaque cloud altitude
        status = nf90_def_var(fileID,"clopaquemeanz",nf90_float, (/dimID(1)/),varID(101))
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
        status = nf90_put_att(fileID,varID(101),"long_name","CALIPSO Opaque Cloud Altitude")
@@ -577,7 +577,7 @@ subroutine write_cosp2_output(Npoints, Ncolumns, Nlevels, lev, lon, lat, cospOUT
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
        status = nf90_put_att(fileID,varID(101),"standard_name", "opaque_cloud_altitude")
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))           
-       ! Thin cloud temperature
+       ! Thin cloud altitude
        status = nf90_def_var(fileID,"clthinmeanz",nf90_float, (/dimID(1)/),varID(102))
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
        status = nf90_put_att(fileID,varID(102),"long_name","CALIPSO Thin Cloud Altitude")
@@ -608,7 +608,7 @@ subroutine write_cosp2_output(Npoints, Ncolumns, Nlevels, lev, lon, lat, cospOUT
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
        status = nf90_put_att(fileID,varID(104),"standard_name", "opaque_cloud_altitude_se")
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))           
-       ! Thin cloud 
+       ! Thin cloud altitude with respect to Surface Elevation
        status = nf90_def_var(fileID,"clthinmeanzse",nf90_float, (/dimID(1)/),varID(105))
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
        status = nf90_put_att(fileID,varID(105),"long_name","CALIPSO Thin Cloud Altitude with respect to SE")
@@ -617,7 +617,7 @@ subroutine write_cosp2_output(Npoints, Ncolumns, Nlevels, lev, lon, lat, cospOUT
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
        status = nf90_put_att(fileID,varID(105),"standard_name", "thin_cloud_altitude_se")
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))    
-       ! z_opaque 
+       ! z_opaque altitude with respect to Surface Elevation
        status = nf90_def_var(fileID,"clzopaquecalipsose",nf90_float, (/dimID(1)/),varID(106))
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
        status = nf90_put_att(fileID,varID(106),"long_name","CALIPSO z_opaque Altitude with respect to SE")
diff --git a/src/simulator/actsim/lidar_simulator.F90 b/src/simulator/actsim/lidar_simulator.F90
index 24ab054a01..7ea81bca67 100644
--- a/src/simulator/actsim/lidar_simulator.F90
+++ b/src/simulator/actsim/lidar_simulator.F90
@@ -1349,7 +1349,7 @@ SUBROUTINE COSP_OPAQ(Npoints,Ncolumns,Nlevels,Ntype,tmp,x,S_att,S_cld,undef,lida
           cldy(:,:,k)=0._wp
        endwhere
        ! Fully attenuated layer detection at subgrid-scale:
-       where ( (x(:,:,k) .lt. S_att_opaq) .and. (x(:,:,k) .gt. 0.) .and. (x(:,:,k) .ne. undef) ) !DEBUG
+       where ( (x(:,:,k) .lt. S_att_opaq) .and. (x(:,:,k) .ge. 0.) .and. (x(:,:,k) .ne. undef) )
           cldyopaq(:,:,k)=1._wp
        elsewhere
           cldyopaq(:,:,k)=0._wp
@@ -1363,7 +1363,7 @@ SUBROUTINE COSP_OPAQ(Npoints,Ncolumns,Nlevels,Ntype,tmp,x,S_att,S_cld,undef,lida
           srok(:,:,k)=0._wp
        endwhere
        ! Number of usefull sub-columns layers for z_opaque 3D fraction:
-       where ( (x(:,:,k) .gt. 0.) .and. (x(:,:,k) .ne. undef) ) !DEBUG
+       where ( (x(:,:,k) .ge. 0.) .and. (x(:,:,k) .ne. undef) )
           srokopaq(:,:,k)=1._wp
        elsewhere
           srokopaq(:,:,k)=0._wp