diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
index bdbd5f363..74a399d18 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
@@ -181,6 +181,7 @@ Galileo_E1_Tcp_Connector_Tracking_cc::Galileo_E1_Tcp_Connector_Tracking_cc(
     d_acc_code_phase_secs = 0.0;
     d_code_phase_samples = 0;
     d_next_prn_length_samples = 0;
+    d_carrier_doppler_hz = 0.0;
 }
 
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index 671b3ddc1..cf9188164 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
@@ -185,6 +185,7 @@ Gps_L1_Ca_Tcp_Connector_Tracking_cc::Gps_L1_Ca_Tcp_Connector_Tracking_cc(
     d_acc_carrier_phase_rad = 0.0;
     d_code_phase_samples = 0;
     d_next_prn_length_samples = 0;
+    d_code_phase_step_chips = 0.0;
 }
 
 void Gps_L1_Ca_Tcp_Connector_Tracking_cc::start_tracking()
@@ -472,7 +473,7 @@ int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work (int noutput_items, gr_vec
             T_prn_seconds = T_chip_seconds * GPS_L1_CA_CODE_LENGTH_CHIPS;
             T_prn_samples = T_prn_seconds * (double)d_fs_in;
             d_rem_code_phase_samples = d_next_rem_code_phase_samples;
-            //K_blk_samples = T_prn_samples + d_rem_code_phase_samples;//-code_error*(double)d_fs_in;
+            K_blk_samples = T_prn_samples + d_rem_code_phase_samples;//-code_error*(double)d_fs_in;
 
             // Update the current PRN delay (code phase in samples)
             double T_prn_true_seconds = GPS_L1_CA_CODE_LENGTH_CHIPS / GPS_L1_CA_CODE_RATE_HZ;
diff --git a/src/core/system_parameters/gps_cnav_ephemeris.cc b/src/core/system_parameters/gps_cnav_ephemeris.cc
index 6b231f0cb..569d69815 100644
--- a/src/core/system_parameters/gps_cnav_ephemeris.cc
+++ b/src/core/system_parameters/gps_cnav_ephemeris.cc
@@ -73,4 +73,20 @@ Gps_CNAV_Ephemeris::Gps_CNAV_Ephemeris()
     d_satvel_X = 0.0;
     d_satvel_Y = 0.0;
     d_satvel_Z = 0.0;
+
+    i_URA = 0;
+    i_signal_health = 0;
+    d_Top = 0.0;
+    d_DELTA_A = 0.0;
+    d_A_DOT = 0.0;
+    d_Delta_n = 0.0;
+    d_DELTA_DOT_N = 0.0;
+    d_DELTA_OMEGA_DOT = 0.0;
+    d_URA0 = 0.0;
+    d_URA1 = 0.0;
+    d_URA2 = 0.0;
+    d_ISCL1 = 0.0;
+    d_ISCL2 = 0.0;
+    d_ISCL5I = 0.0;
+    d_ISCL5Q = 0.0;
 }