diff --git a/mls-rs/src/group/mod.rs b/mls-rs/src/group/mod.rs
index d029350b..f671c746 100644
--- a/mls-rs/src/group/mod.rs
+++ b/mls-rs/src/group/mod.rs
@@ -960,7 +960,7 @@ where
         let mut new_leaf_node: LeafNode = self.current_user_leaf_node()?.clone();
         let new_leaf_node_extensions =
             leaf_node_extensions.unwrap_or(new_leaf_node.ungreased_extensions());
-        let properties = self.config.leaf_properties(new_leaf_node_extensions)
+        let properties = self.config.leaf_properties(new_leaf_node_extensions);
 
         #[cfg(feature = "replace_proposal")]
         let mut properties = properties;
diff --git a/mls-rs/src/group/proposal_filter/filtering.rs b/mls-rs/src/group/proposal_filter/filtering.rs
index 116f6f3c..43ad5da2 100644
--- a/mls-rs/src/group/proposal_filter/filtering.rs
+++ b/mls-rs/src/group/proposal_filter/filtering.rs
@@ -265,7 +265,7 @@ where
                             .check_if_valid(
                                 leaf,
                                 ValidationContext::Update((
-                                    self.group_id,
+                                    &self.original_context.group_id,
                                     *to_replace,
                                     commit_time,
                                 )),
@@ -282,7 +282,7 @@ where
                             .valid_successor(
                                 &old_leaf.signing_identity,
                                 &leaf.signing_identity,
-                                group_extensions_in_use,
+                                new_extensions,
                             )
                             .await
                             .map_err(|e| MlsError::IdentityProviderError(e.into_any_error()))
diff --git a/mls-rs/src/group/snapshot.rs b/mls-rs/src/group/snapshot.rs
index 8a652d68..a9da7f98 100644
--- a/mls-rs/src/group/snapshot.rs
+++ b/mls-rs/src/group/snapshot.rs
@@ -19,7 +19,7 @@ use crate::{
     group::{
         message_hash::MessageHash,
         proposal_cache::{CachedProposal, ProposalCache},
-        ProposalMessageDescription, ProposalRef,
+        ProposalMessageDescription, ProposalRef, PendingUpdate
     },
     map::SmallMap,
 };
@@ -29,10 +29,6 @@ use mls_rs_core::crypto::SignatureSecretKey;
 #[cfg(feature = "tree_index")]
 use mls_rs_core::identity::IdentityProvider;
 
-use super::{
-    state_repo::PendingUpdate,
-};
-
 #[derive(Debug, PartialEq, Clone, MlsEncode, MlsDecode, MlsSize)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub(crate) struct Snapshot {