diff --git a/openair1/PHY/LTE_TRANSPORT/dci.c b/openair1/PHY/LTE_TRANSPORT/dci.c
index d8a13bbbfdbc0abfc760aa4853aba0eeba25362d..83ebaaaa377732ed5e1cc63038e287366de2dbdf 100755
--- a/openair1/PHY/LTE_TRANSPORT/dci.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci.c
@@ -57,8 +57,8 @@
 
 
 
-static uint8_t d[3*(MAX_DCI_SIZE_BITS + 16) + 96];
-static uint8_t w[3*3*(MAX_DCI_SIZE_BITS+16)];
+//static uint8_t d[3*(MAX_DCI_SIZE_BITS + 16) + 96];
+//static uint8_t w[3*3*(MAX_DCI_SIZE_BITS+16)];
 
 void dci_encoding(uint8_t *a,
                   uint8_t A,
@@ -70,6 +70,8 @@ void dci_encoding(uint8_t *a,
 
   uint8_t D = (A + 16);
   uint32_t RCC;
+  uint8_t d[3*(MAX_DCI_SIZE_BITS + 16) + 96];
+  uint8_t w[3*3*(MAX_DCI_SIZE_BITS+16)];
 
 #ifdef DEBUG_DCI_ENCODING
   int32_t i;
@@ -169,7 +171,7 @@ uint8_t *generate_dci0(uint8_t *dci,
   return(e+coded_bits);
 }
 
-uint32_t Y;
+//uint32_t Y;
 
 
 
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index e3e60184455826112a72816f8ef6500c3435c373..4dd664b07279ef11179f8de110447b30111c067a 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -29,7 +29,9 @@
  */
 #define RRC_ENB
 #define RRC_ENB_C
-
+#include <asn_application.h>
+#include <asn_internal.h> /* for _ASN_DEFAULT_STACK_MAX */
+#include <per_encoder.h>
 #include "rrc_defs.h"
 #include "rrc_extern.h"
 #include "assertions.h"
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index 40075429182531d06d61b1654ec9cd9ad7765d9a..ddaff6b2f2737aa47c2438bcbed6cd0f5f9a7da3 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -1098,9 +1098,6 @@ int main( int argc, char **argv )
     printf("ITTI tasks created\n");
 #endif
 
-  // init UE_PF_PO and mutex lock
-  pthread_mutex_init(&ue_pf_po_mutex, NULL);
-  memset (&UE_PF_PO[0][0], 0, sizeof(UE_PF_PO_t)*NUMBER_OF_UE_MAX*MAX_NUM_CCs);
   
   mlockall(MCL_CURRENT | MCL_FUTURE);