diff --git a/ferveo-common/src/keypair.rs b/ferveo-common/src/keypair.rs
index 485241b3..9b251125 100644
--- a/ferveo-common/src/keypair.rs
+++ b/ferveo-common/src/keypair.rs
@@ -61,15 +61,7 @@ impl<E: Pairing> PublicKey<E> {
 
 impl<E: Pairing> PartialOrd for PublicKey<E> {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        if self.encryption_key.x() == other.encryption_key.x() {
-            return self
-                .encryption_key
-                .y()
-                .partial_cmp(&other.encryption_key.y());
-        }
-        self.encryption_key
-            .x()
-            .partial_cmp(&other.encryption_key.x())
+        Some(self.cmp(other))
     }
 }
 
@@ -102,7 +94,7 @@ pub struct Keypair<E: Pairing> {
 
 impl<E: Pairing> PartialOrd for Keypair<E> {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.decryption_key.partial_cmp(&other.decryption_key)
+        Some(self.cmp(other))
     }
 }
 
diff --git a/ferveo/src/api.rs b/ferveo/src/api.rs
index b2179ee6..3c354bcb 100644
--- a/ferveo/src/api.rs
+++ b/ferveo/src/api.rs
@@ -139,7 +139,7 @@ impl From<bindings_wasm::FerveoVariant> for FerveoVariant {
 }
 
 #[serde_as]
-#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub struct DkgPublicKey(
     #[serde_as(as = "serialization::SerdeAs")] pub(crate) G1Affine,
 );
diff --git a/ferveo/src/dkg.rs b/ferveo/src/dkg.rs
index 9c95d96a..3c9bdf83 100644
--- a/ferveo/src/dkg.rs
+++ b/ferveo/src/dkg.rs
@@ -28,7 +28,7 @@ pub struct DkgValidator<E: Pairing> {
 
 impl<E: Pairing> PartialOrd for DkgValidator<E> {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.share_index.partial_cmp(&other.share_index)
+        Some(self.cmp(other))
     }
 }
 
diff --git a/ferveo/src/validator.rs b/ferveo/src/validator.rs
index fba25f5c..7b014266 100644
--- a/ferveo/src/validator.rs
+++ b/ferveo/src/validator.rs
@@ -49,7 +49,7 @@ pub struct Validator<E: Pairing> {
 
 impl<E: Pairing> PartialOrd for Validator<E> {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.address.partial_cmp(&other.address)
+        Some(self.cmp(other))
     }
 }