diff --git a/common/utils/telnetsrv/telnetsrv_measurements.c b/common/utils/telnetsrv/telnetsrv_measurements.c
index fe6d4337cf..8e1e8ecbd7 100644
--- a/common/utils/telnetsrv/telnetsrv_measurements.c
+++ b/common/utils/telnetsrv/telnetsrv_measurements.c
@@ -235,8 +235,8 @@ int measurcmd_async(char *buf, int debug, telnet_printfunc_t prnt) {
   int idx1, idx2;
   int okcmd=0;
 
-  if buff == NULL) {
-	  measurcmd_async_help();
+  if (buf == NULL) {
+	  measurcmd_async_help(prnt);
 	  return CMDSTATUS_FOUND;
   }
   if (debug > 0)
diff --git a/openair1/PHY/TOOLS/time_meas.h b/openair1/PHY/TOOLS/time_meas.h
index e982c3b828..83cf6107b0 100644
--- a/openair1/PHY/TOOLS/time_meas.h
+++ b/openair1/PHY/TOOLS/time_meas.h
@@ -56,7 +56,7 @@ typedef struct {
   int               msgid;                  /*!< \brief message id, as defined by TIMESTAT_MSGID_X macros */
   int               timestat_id;            /*!< \brief points to the time_stats_t entry in cpumeas table */
   OAI_CPUTIME_TYPE  ts;                     /*!< \brief time stamp */
-  void (*displayFunc)(void *);              /*!< \brief function to call when DISPLAY message is received*/
+  void              *displayFunc;           /*!< \brief function to call when DISPLAY message is received*/
 } time_stats_msg_t;
 
 
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index 06768930b0..f61648d8b4 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -421,7 +421,7 @@ typedef struct NRRrcConfigurationReq_s {
 
 // UE: NAS -> RRC messages
 typedef kenb_refresh_req_t      NasKenbRefreshReq;
-typedef cell_info_req_t         NasCellSelectionReq __attribute__ (( aligned (__alignof__(char)) ));
+typedef cell_info_req_t         NasCellSelectionReq;
 typedef nas_establish_req_t     NasConnEstabliReq;
 typedef ul_info_transfer_req_t  NasUlDataReq;
 
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.h b/openair2/LAYER2/PDCP_v10.1.0/pdcp.h
index 6b9d34fc84..0c3dd2f04f 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.h
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.h
@@ -483,7 +483,7 @@ typedef struct {
     uint8_t status;
     PC5SignallingMessage pc5_signalling_message;
   } pc5sPrimitive;
-} __attribute__((__packed__, aligned (__alignof__(char)))) sidelink_pc5s_element;
+} __attribute__((__packed__)) sidelink_pc5s_element;
 
 
 /*