diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
index 00e6d7ffca..942c6befdf 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
@@ -1773,7 +1773,6 @@ static inline void nr_element_sign(c16_t *a, // a
  * Compute the matrix determinant for 4x4 Matrix
  *
  * */
-<<<<<<< HEAD
 static void nr_determin(int size,
                         c16_t *a44[][size], //
                         c16_t *ad_bc, // ad-bc
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index f660e9559c..966f9542e9 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -873,7 +873,7 @@ int main(int argc, char **argv)
 
   if (input_fd != NULL || n_trials == 1) max_rounds=1;
 
-  if(1<<ptrs_time_density >= nb_symb_sch)
+  if (enable_ptrs && 1 << ptrs_time_density >= nb_symb_sch)
     pdu_bit_map &= ~PUSCH_PDU_BITMAP_PUSCH_PTRS; // disable PUSCH PTRS
 
   printf("\n");
diff --git a/openair1/SIMULATION/TOOLS/rangen_double.c b/openair1/SIMULATION/TOOLS/rangen_double.c
index 30ab760be8..ddc453de9c 100644
--- a/openair1/SIMULATION/TOOLS/rangen_double.c
+++ b/openair1/SIMULATION/TOOLS/rangen_double.c
@@ -200,7 +200,7 @@ double __attribute__ ((no_sanitize("address", "undefined"))) gaussZiggurat(doubl
   }
   hz = SHR3;
   iz = hz & 127;
-  return abs(hz) < kn[iz] ? hz * wn[iz] : nfix();
+  return hz != INT32_MIN && abs(hz) < kn[iz] ? hz * wn[iz] : nfix();
 }
 
 #ifdef MAIN