diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ae2cdaca4..1083c18c57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2279,7 +2279,7 @@ add_executable(rftest
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
 )
-target_link_libraries(rftest PRIVATE minimal_lib CONFIG_LIB PHY_NR_COMMON UTIL pthread dl m ${T_LIB} shlib_loader)
+target_link_libraries(rftest PRIVATE minimal_lib CONFIG_LIB PHY_NR_COMMON UTIL forms pthread dl m ${T_LIB} shlib_loader)
 target_link_libraries(rftest PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 add_executable(polartest
diff --git a/openair1/PHY/TOOLS/calibration_test.c b/openair1/PHY/TOOLS/calibration_test.c
index 5d03d68c57..4dc3d658fe 100644
--- a/openair1/PHY/TOOLS/calibration_test.c
+++ b/openair1/PHY/TOOLS/calibration_test.c
@@ -50,7 +50,6 @@ int main(int argc, char **argv) {
 
     
   int N_RB=50;
-  int subCarrierFreq=30e3;
   int sampling_rate=30.72e6;
   int DFT=2048;
   int TxAdvanceInDFTSize=12;
@@ -325,17 +324,8 @@ int main(int argc, char **argv) {
   while(!oai_exit) {
     for (int i=0; i<antennas; i++)
       read(fd, samplesTx[i], DFT*sizeof(c16_t));
-    int readBlockSize = rfdevice.trx_read_func(&rfdevice,
-					       &timestamp,
-					       samplesRx,
-					       DFT,
-					       antennas);
-    int txs = rfdevice.trx_write_func(&rfdevice,
-					    timestamp+TxAdvanceInDFTSize*DFT,
-					    samplesTx,
-					    DFT,
-					    antennas,
-					    0);
+    rfdevice.trx_read_func(&rfdevice, &timestamp, samplesRx, DFT, antennas);
+    rfdevice.trx_write_func(&rfdevice, timestamp + TxAdvanceInDFTSize * DFT, samplesTx, DFT, antennas, 0);
   }
 
   return 0;