diff --git a/common/utils/T/local_tracer.c b/common/utils/T/local_tracer.c
index e2b8afda40..c1f1002505 100644
--- a/common/utils/T/local_tracer.c
+++ b/common/utils/T/local_tracer.c
@@ -139,11 +139,7 @@ void send_T_messages_txt(void *forwarder) {
     /* TODO: be careful, we use internal T stuff, to rewrite? */
     T_LOCAL_size = 0;
     T_HEADER(T_ID(-1));
-    T_PUT_buffer(1, ((T_buffer) {
-.addr=
-(src), .length=
-      (send_size)
-    }));
+    T_PUT_buffer(1, ((T_buffer) { .addr= (src), .length= (send_size) }));
     forward(forwarder, buf, T_LOCAL_size);
     src += send_size;
     src_len -= send_size;
diff --git a/common/utils/threadPool/thread-pool.h b/common/utils/threadPool/thread-pool.h
index 656c68f529..8378dc0c1d 100644
--- a/common/utils/threadPool/thread-pool.h
+++ b/common/utils/threadPool/thread-pool.h
@@ -286,29 +286,31 @@ static inline notifiedFIFO_elt_t *pullTpool(notifiedFIFO_t *responseFifo, tpool_
   notifiedFIFO_elt_t *msg= pullNotifiedFIFO(responseFifo);
   if (msg == NULL)
     return NULL;
-  AssertFatal(t->traceFd, "Thread pool used while not initialized");
+  AssertFatal(t->traceFd > 0, "Thread pool used while not initialized");
   if (t->measurePerf)
     msg->returnTime=rdtsc_oai();
 
-  if (t->traceFd > 0)
-    if(write(t->traceFd, msg, sizeof(*msg)))
-      {};
+  if (t->traceFd > 0) {
+    ssize_t b = write(t->traceFd, msg, sizeof(*msg));
+    AssertFatal(b > 0, "error in write(): %d, %s\n", errno, strerror(errno));
+  }
 
   return msg;
 }
 
 static inline notifiedFIFO_elt_t *tryPullTpool(notifiedFIFO_t *responseFifo, tpool_t *t) {
   notifiedFIFO_elt_t *msg= pollNotifiedFIFO(responseFifo);
-  AssertFatal(t->traceFd, "Thread pool used while not initialized");
+  AssertFatal(t->traceFd > 0, "Thread pool used while not initialized");
   if (msg == NULL)
     return NULL;
 
   if (t->measurePerf)
     msg->returnTime=rdtsc_oai();
 
-  if (t->traceFd)
-    if(write(t->traceFd, msg, sizeof(*msg)))
-      {};
+  if (t->traceFd > 0) {
+    ssize_t b = write(t->traceFd, msg, sizeof(*msg));
+    AssertFatal(b > 0, "error in write(): %d, %s\n", errno, strerror(errno));
+  }
 
   return msg;
 }
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index 9f586723b2..e2809b6ca3 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -2685,7 +2685,7 @@ allocate_prbs_sub(int nb_rb,
           break;
 
         case 25:
-          if (check == (N_RBG - 1)) {
+          if (check == N_RBG - 1) {
             nb_rb--;
           } else {
             nb_rb -= 2;
@@ -2694,7 +2694,7 @@ allocate_prbs_sub(int nb_rb,
           break;
 
         case 50:
-          if (check == (N_RBG - 1)) {
+          if (check == N_RBG - 1) {
             nb_rb -= 2;
           } else {
             nb_rb -= 3;