diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index fdc1f4289e..365957cad5 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -402,7 +402,14 @@ static int trx_usrp_write(openair0_device *device,
       for (int j=0; j<nsamps2; j++) {
 #if defined(__x86_64__) || defined(__i386__)
 #ifdef __AVX2__
-        buff_tx[i][j] = _mm256_slli_epi16(((__m256i *)buff[i])[j],4);
+        if ((((uintptr_t) buff[i])&0x1F)==0) {
+          buff_tx[i][j] = _mm256_slli_epi16(((__m256i *)buff[i])[j],4);
+        }
+        else 
+        {
+          ((__m128i *)buff_tx[i])[2*j]   = _mm_slli_epi16(((__m128i *)buff[i])[2*j],4);
+          ((__m128i *)buff_tx[i])[2*j+1] = _mm_slli_epi16(((__m128i *)buff[i])[2*j+1],4);
+        }
 #else
         buff_tx[i][j] = _mm_slli_epi16(((__m128i *)buff[i])[j],4);
 #endif
@@ -540,7 +547,14 @@ void *trx_usrp_write_thread(void * arg){
       for (int j=0; j<nsamps2; j++) {
         #if defined(__x86_64__) || defined(__i386__)
           #ifdef __AVX2__
-            buff_tx[i][j] = _mm256_slli_epi16(((__m256i *)buff[i])[j],4);
+            if ((((uintptr_t) buff[i])&0x1F)==0) {
+              buff_tx[i][j] = _mm256_slli_epi16(((__m256i *)buff[i])[j],4);
+            }
+            else
+            {
+              ((__m128i *)buff_tx[i])[2*j]   = _mm_slli_epi16(((__m128i *)buff[i])[2*j],4);
+              ((__m128i *)buff_tx[i])[2*j+1] = _mm_slli_epi16(((__m128i *)buff[i])[2*j+1],4);
+            }
           #else
             buff_tx[i][j] = _mm_slli_epi16(((__m128i *)buff[i])[j],4);
           #endif
@@ -682,10 +696,15 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
 
         if ((((uintptr_t) buff[i])&0x1F)==0) {
           ((__m256i *)buff[i])[j] = _mm256_srai_epi16(buff_tmp[i][j],rxshift);
-        } else {
+        } else if ((((uintptr_t) buff[i])&0x0F)==0) {
           ((__m128i *)buff[i])[2*j] = _mm_srai_epi16(((__m128i *)buff_tmp[i])[2*j],rxshift);
           ((__m128i *)buff[i])[2*j+1] = _mm_srai_epi16(((__m128i *)buff_tmp[i])[2*j+1],rxshift);
-        }
+        }  else {
+	  ((__m64 *)buff[i])[4*j]   = _mm_srai_pi16 (((__m64 *)buff_tmp[i])[4*j],rxshift);
+	  ((__m64 *)buff[i])[4*j+1] = _mm_srai_pi16 (((__m64 *)buff_tmp[i])[4*j+1],rxshift);
+	  ((__m64 *)buff[i])[4*j+2] = _mm_srai_pi16 (((__m64 *)buff_tmp[i])[4*j+2],rxshift);
+	  ((__m64 *)buff[i])[4*j+3] = _mm_srai_pi16 (((__m64 *)buff_tmp[i])[4*j+3],rxshift);
+	}
 
 #else
         ((__m128i *)buff[i])[j] = _mm_srai_epi16(buff_tmp[i][j],rxshift);
@@ -1127,8 +1146,8 @@ extern "C" {
         // from usrp_time_offset
         //openair0_cfg[0].samples_per_packet    = 2048;
         openair0_cfg[0].tx_sample_advance     = 15; //to be checked
-        openair0_cfg[0].tx_bw                 = 80e6;
-        openair0_cfg[0].rx_bw                 = 80e6;
+        //openair0_cfg[0].tx_bw                 = 80e6;
+        //openair0_cfg[0].rx_bw                 = 80e6;
         break;
 
       case 61440000:
@@ -1154,6 +1173,13 @@ extern "C" {
         openair0_cfg[0].rx_bw                 = 20e6;
         break;
 
+      case 23040000:
+        //openair0_cfg[0].samples_per_packet    = 2048;
+        openair0_cfg[0].tx_sample_advance     = 15;
+        openair0_cfg[0].tx_bw                 = 20e6;
+        openair0_cfg[0].rx_bw                 = 20e6;
+        break;
+
       case 15360000:
         //openair0_cfg[0].samples_per_packet    = 2048;
         openair0_cfg[0].tx_sample_advance     = 45;