diff --git a/tip-router-operator-cli/src/main.rs b/tip-router-operator-cli/src/main.rs
index e5bf21d9..a5e0464f 100644
--- a/tip-router-operator-cli/src/main.rs
+++ b/tip-router-operator-cli/src/main.rs
@@ -14,8 +14,8 @@ use ::{
         cli::{Cli, Commands, SnapshotPaths},
         create_merkle_tree_collection, create_meta_merkle_tree, create_stake_meta,
         ledger_utils::get_bank_from_snapshot_at_slot,
-        load_bank_from_snapshot, meta_merkle_tree_path, process_epoch, read_merkle_tree_collection,
-        read_stake_meta_collection, reclaim,
+        load_bank_from_snapshot, merkle_tree_collection_file_name, meta_merkle_tree_file_name,
+        process_epoch, read_merkle_tree_collection, read_stake_meta_collection, reclaim,
         restaking::RestakingHandler,
         submit::{submit_recent_epochs_to_ncn, submit_to_ncn},
         tip_distribution_stats::get_tip_distribution_stats,
@@ -431,7 +431,7 @@ async fn main() -> Result<()> {
             epoch,
             set_merkle_roots,
         } => {
-            let meta_merkle_tree_path = meta_merkle_tree_path(epoch, &cli.get_save_path());
+            let meta_merkle_tree_path = save_path.join(meta_merkle_tree_file_name(epoch));
 
             info!(
                 "Submitting epoch {} from {}...",
diff --git a/tip-router-operator-cli/src/submit.rs b/tip-router-operator-cli/src/submit.rs
index 2bfccefe..44495ce8 100644
--- a/tip-router-operator-cli/src/submit.rs
+++ b/tip-router-operator-cli/src/submit.rs
@@ -379,7 +379,7 @@ async fn get_tip_distribution_accounts_to_upload(
     let tip_distribution_accounts = tip_distribution_accounts
         .into_iter()
         .filter_map(|(pubkey, account)| {
-            let tip_distribution_account = TipDistributionAccount::deserialize(&account.data[8..]);
+            let tip_distribution_account = TipDistributionAccount::deserialize(&account.data);
             tip_distribution_account.map_or(None, |tip_distribution_account| {
                 if tip_distribution_account.epoch_created_at == epoch
                     && tip_distribution_account.merkle_root_upload_authority