diff --git a/common/registration/src/lib.rs b/common/registration/src/lib.rs
index 5ad090488e..d11337f687 100644
--- a/common/registration/src/lib.rs
+++ b/common/registration/src/lib.rs
@@ -8,7 +8,7 @@ use nym_ip_packet_requests::IpPair;
 use nym_kkt_ciphersuite::{Ciphersuite, KEM, KEMKeyDigests};
 use nym_sphinx::addressing::Recipient;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
 
 pub use lp_messages::*;
@@ -56,7 +56,7 @@ pub struct WireguardConfiguration {
 #[derive(Clone, Debug)]
 pub struct NymNodeLPInformation {
     pub address: SocketAddr,
-    pub expected_kem_key_hashes: HashMap<KEM, KEMKeyDigests>,
+    pub expected_kem_key_hashes: BTreeMap<KEM, KEMKeyDigests>,
     pub x25519: x25519::PublicKey,
 
     // to be inferred from node's version
diff --git a/gateway/src/node/lp_listener/handler.rs b/gateway/src/node/lp_listener/handler.rs
index 77d4ccaf03..9292ce7029 100644
--- a/gateway/src/node/lp_listener/handler.rs
+++ b/gateway/src/node/lp_listener/handler.rs
@@ -712,7 +712,6 @@ mod tests {
 
         let lp_config = LpConfig {
             debug: LpDebug {
-                timestamp_tolerance: Duration::from_secs(30),
                 ..Default::default()
             },
             ..Default::default()
diff --git a/integration-tests/src/lp_registration.rs b/integration-tests/src/lp_registration.rs
index 890498fa2d..5b47b4f6ce 100644
--- a/integration-tests/src/lp_registration.rs
+++ b/integration-tests/src/lp_registration.rs
@@ -205,7 +205,6 @@ mod tests {
 
             let lp_config = LpConfig {
                 debug: LpDebug {
-                    timestamp_tolerance: Duration::from_secs(30),
                     ..Default::default()
                 },
                 ..Default::default()
diff --git a/nym-api/src/nym_nodes/handlers/v2.rs b/nym-api/src/nym_nodes/handlers/v2.rs
index d6306001bc..ee49e575fa 100644
--- a/nym-api/src/nym_nodes/handlers/v2.rs
+++ b/nym-api/src/nym_nodes/handlers/v2.rs
@@ -1,7 +1,7 @@
 // Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use crate::node_status_api::models::{AxumErrorResponse, AxumResult};
+use crate::node_status_api::models::AxumResult;
 use crate::support::http::helpers::PaginationRequest;
 use crate::support::http::state::AppState;
 use axum::extract::{Query, State};
diff --git a/nym-node/nym-node-requests/src/api/client.rs b/nym-node/nym-node-requests/src/api/client.rs
index e88e846099..6e3b93eeca 100644
--- a/nym-node/nym-node-requests/src/api/client.rs
+++ b/nym-node/nym-node-requests/src/api/client.rs
@@ -1,25 +1,24 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::api::v1::gateway::models::WebSockets;
-use crate::api::v1::node::models::{
-    AuxiliaryDetails, NodeDescription, NodeRoles, SignedHostInformation,
-};
-use crate::routes;
-use async_trait::async_trait;
-use nym_bin_common::build_information::BinaryBuildInformationOwned;
-use nym_http_api_client::{ApiClient, HttpClientError};
-
 use super::v1::gateway::models::Wireguard;
 use super::v1::metrics::models::SessionStats;
 use crate::api::SignedLewesProtocol;
 use crate::api::v1::authenticator::models::Authenticator;
+use crate::api::v1::gateway::models::WebSockets;
 use crate::api::v1::health::models::NodeHealth;
 use crate::api::v1::ip_packet_router::models::IpPacketRouter;
-use crate::api::v1::lewes_protocol::models::LewesProtocol;
 use crate::api::v1::network_requester::exit_policy::models::UsedExitPolicy;
 use crate::api::v1::network_requester::models::NetworkRequester;
+use crate::api::v1::node::models::{
+    AuxiliaryDetails, NodeDescription, NodeRoles, SignedHostInformation,
+};
 use crate::api::v1::node_load::models::NodeLoad;
+use crate::routes;
+use async_trait::async_trait;
+use nym_bin_common::build_information::BinaryBuildInformationOwned;
+use nym_http_api_client::{ApiClient, HttpClientError};
+
 pub use nym_http_api_client::Client;
 
 pub type NymNodeApiClientError = HttpClientError;
diff --git a/nym-registration-client/src/lp_client/client.rs b/nym-registration-client/src/lp_client/client.rs
index 4de1fd990e..4376371e6a 100644
--- a/nym-registration-client/src/lp_client/client.rs
+++ b/nym-registration-client/src/lp_client/client.rs
@@ -707,11 +707,11 @@ where
     /// the gateway to look up the session for decryption.
     ///
     /// # Returns
-    /// * `Ok(u32)` - The session ID
+    /// * `Ok(u64)` - The session ID
     ///
     /// # Errors
     /// Returns an error if handshake has not been completed.
-    pub fn session_id(&self) -> Result<u32> {
+    pub fn session_id(&self) -> Result<u64> {
         self.state_machine()?
             .session()
             .map(|s| s.receiver_index())