diff --git a/targets/ARCH/COMMON/common_lib.h b/targets/ARCH/COMMON/common_lib.h
index 81a5bd0f54f740cbb66e2d82180f8a3f67539c0b..3d92fd38edde6324241ad69785ed223f11d7ec55 100644
--- a/targets/ARCH/COMMON/common_lib.h
+++ b/targets/ARCH/COMMON/common_lib.h
@@ -410,7 +410,6 @@ typedef int(*oai_transport_initfunc_t)(openair0_device *device, openair0_config_
 
 #define OPTION_LZ4  0x00000001          // LZ4 compression (option_value is set to compressed size)
 
-#define sample_t struct complex16 // 2*16 bits complex number
 
 typedef struct {
   uint64_t magic;          // Magic value (see defines above)
diff --git a/targets/ARCH/rfsimulator/simulator.c b/targets/ARCH/rfsimulator/simulator.c
index d516ce152d78504ca3090e425f02347640d4c38d..76f2f3f0fbacfce031b70b5a50cef0b9107d52a1 100644
--- a/targets/ARCH/rfsimulator/simulator.c
+++ b/targets/ARCH/rfsimulator/simulator.c
@@ -65,6 +65,7 @@ extern RAN_CONTEXT_t RC;
 
 pthread_mutex_t Sockmutex;
 
+typedef struct complex16 sample_t; // 2*16 bits complex number
 
 typedef struct buffer_s {
   int conn_sock;
diff --git a/targets/ARCH/rfsimulator/stored_node.c b/targets/ARCH/rfsimulator/stored_node.c
index a23127d3b56c581169f6b1da8486f8c134249d28..8cf3aa3bb269958070a582801ae5650229579d5a 100644
--- a/targets/ARCH/rfsimulator/stored_node.c
+++ b/targets/ARCH/rfsimulator/stored_node.c
@@ -5,6 +5,7 @@
 
 #include <common/utils/simple_executable.h>
 
+volatile int             oai_exit = 0;
 
 void fullwrite(int fd, void *_buf, int count) {
   char *buf = _buf;
@@ -123,7 +124,7 @@ int main(int argc, char *argv[]) {
     setblocking(serviceSock, blocking);
     AssertFatal(read(fd,&header,sizeof(header)), "");
     fullwrite(serviceSock, &header, sizeof(header));
-    int dataSize=sizeof(sample_t)*header.size*header.nbAnt;
+    int dataSize=sizeof(int32_t)*header.size*header.nbAnt;
 
     if (dataSize>bufSize) {
       void * new_buff = realloc(buff, dataSize);