diff --git a/openair1/PHY/CODING/crc_byte.c b/openair1/PHY/CODING/crc_byte.c
index c3b141db8e..a0ad837e87 100644
--- a/openair1/PHY/CODING/crc_byte.c
+++ b/openair1/PHY/CODING/crc_byte.c
@@ -153,7 +153,7 @@ unsigned int crc24a (unsigned char * inptr,
 {
   int octetlen = bitlen / 8;  /* Change in octets */
 
-  if ( bitlen % 8 || !__builtin_cpu_supports ("pclmul") ) {
+  if ( bitlen % 8 /*|| !__builtin_cpu_supports ("pclmul")*/ ) {
     unsigned int crc = 0;
     int resbit = (bitlen % 8);
     
@@ -187,7 +187,7 @@ unsigned int crc24b (unsigned char * inptr,
 {
   int octetlen = bitlen / 8;  /* Change in octets */
   
-  if ( bitlen % 8 || !__builtin_cpu_supports ("pclmul") ) {
+  if ( bitlen % 8 /*|| !__builtin_cpu_supports ("pclmul") */) {
   unsigned int crc = 0;
   int resbit = (bitlen % 8);
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c
index 1cb3fdb708..4687f6aeea 100644
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
@@ -325,8 +325,6 @@ void config_common(int Mod_idP, int ssb_SubcarrierOffset, int pdsch_AntennaPorts
   } else {
     ssb_SubcarrierOffset_limit = 12;
   }
-  if (ssb_SubcarrierOffset<ssb_SubcarrierOffset_limit)
-    AssertFatal(sco==(scs_scaling * ssb_SubcarrierOffset),"absoluteFrequencySSB has a subcarrier offset of %d while it should be %d\n",sco/scs_scaling,ssb_SubcarrierOffset);
 
   cfg->ssb_table.ssb_offset_point_a.value = absolute_diff/(12*scs_scaling) - 10; //absoluteFrequencySSB is the central frequency of SSB which is made by 20RBs in total
   cfg->ssb_table.ssb_offset_point_a.tl.tag = NFAPI_NR_CONFIG_SSB_OFFSET_POINT_A_TAG;
@@ -334,7 +332,7 @@ void config_common(int Mod_idP, int ssb_SubcarrierOffset, int pdsch_AntennaPorts
   cfg->ssb_table.ssb_period.value = *scc->ssb_periodicityServingCell;
   cfg->ssb_table.ssb_period.tl.tag = NFAPI_NR_CONFIG_SSB_PERIOD_TAG;
   cfg->num_tlv++;
-  cfg->ssb_table.ssb_subcarrier_offset.value = ssb_SubcarrierOffset;
+  cfg->ssb_table.ssb_subcarrier_offset.value = ssb_SubcarrierOffset>>(cfg->ssb_config.scs_common.value);
   cfg->ssb_table.ssb_subcarrier_offset.tl.tag = NFAPI_NR_CONFIG_SSB_SUBCARRIER_OFFSET_TAG;
   cfg->num_tlv++;
 
diff --git a/targets/ARCH/AW2SORI/oaiori.c b/targets/ARCH/AW2SORI/oaiori.c
index f79e2fad20..ec69e27135 100644
--- a/targets/ARCH/AW2SORI/oaiori.c
+++ b/targets/ARCH/AW2SORI/oaiori.c
@@ -317,7 +317,10 @@ int aw2s_startstreaming(openair0_device *device) {
          (openair0_cfg->rx_num_channels > 1 && rx1->fst != ORI_FST_Operational) || 
          tx0->fst != ORI_FST_Operational || 
          (openair0_cfg->tx_num_channels > 1 && tx1->fst != ORI_FST_Operational))
-  {}	
+  {  
+     printf("rx0->fst %d,rx1->fst %d,tx0->fst %d, tx1->fst %d\n",
+	    rx0->fst,rx1 ? rx1->fst : -1, tx0->fst, tx1 ? tx1->fst: -1);
+  }	
 
   // test RX interface 
   uint64_t TS;