diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc
index 0dcbf5d18..7984ae533 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.cc
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc
@@ -394,7 +394,7 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     int nx = 0; /* Number of estimated states */
     if(positioning_mode <= PMODE_FIXED) nx = 4 + 3;
     if(positioning_mode >= PMODE_PPP_KINEMA) nx = NX_PPP(&rtklib_configuration_options);
-    int na = NR_PPP(&rtklib_configuration_options);
+    int na = NP_PPP(&rtklib_configuration_options);
     double x[nx];
     double Px[nx*nx];
     double xa[na];
@@ -411,7 +411,7 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
             3,           /* number of continuous fixes of ambiguity */
             {ambc_},     /* ambiguity control */
             {ssat_},     /* satellite status */
-            128,           /* bytes in error message buffer */
+            256,           /* bytes in error message buffer */
             {'0'},       /* error message buffer */
             rtklib_configuration_options /* processing options */
     };
diff --git a/src/tests/system-tests/position_test.cc b/src/tests/system-tests/position_test.cc
index 5d3d36aa6..a0a1ee974 100644
--- a/src/tests/system-tests/position_test.cc
+++ b/src/tests/system-tests/position_test.cc
@@ -266,9 +266,9 @@ int Position_Gps_L1_System_Test::configure_receiver()
     const float dll_bw_narrow_hz = 2.0;
     const int extend_correlation_ms = 1;
 
-    const int display_rate_ms = 500;
-    const int output_rate_ms = 10;
-    const int positioning_mode = 0;
+    const int display_rate_ms = 1000;
+    const int output_rate_ms = 1000;
+    const int averaging_depth = 1;
 
     config->set_property("GNSS-SDR.internal_fs_hz", std::to_string(sampling_rate_internal));
 
@@ -368,6 +368,9 @@ int Position_Gps_L1_System_Test::configure_receiver()
 
     // Set PVT
     config->set_property("PVT.implementation", "RTKLIB_PVT");
+    //config->set_property("PVT.implementation", "Hybrid_PVT");
+    config->set_property("PVT.averaging_depth", std::to_string(averaging_depth));
+    config->set_property("PVT.flag_averaging", "false");
     config->set_property("PVT.output_rate_ms", std::to_string(output_rate_ms));
     config->set_property("PVT.display_rate_ms", std::to_string(display_rate_ms));
     config->set_property("PVT.dump_filename", "./PVT");
@@ -379,9 +382,10 @@ int Position_Gps_L1_System_Test::configure_receiver()
     config->set_property("PVT.rtcm_dump_devname", "/dev/pts/1");
     config->set_property("PVT.dump", "false");
     config->set_property("PVT.rinex_version", std::to_string(2));
-    config->set_property("PVT.positioning_mode", std::to_string(positioning_mode));
+    config->set_property("PVT.positioning_mode", std::to_string(7));
     config->set_property("PVT.iono_model", std::to_string(0));
     config->set_property("PVT.trop_model", std::to_string(0));
+    config->set_property("PVT.AR_GPS", std::to_string(4));
     return 0;
 }