diff --git a/chirpstack/src/adr/default.rs b/chirpstack/src/adr/default.rs
index 3544c546..ed2b7aef 100644
--- a/chirpstack/src/adr/default.rs
+++ b/chirpstack/src/adr/default.rs
@@ -12,7 +12,6 @@ impl Algorithm {
     }
 
     fn get_ideal_tx_power_index_and_dr(
-        &self,
         nb_step: isize,
         tx_power_index: u8,
         dr: u8,
@@ -46,7 +45,7 @@ impl Algorithm {
             nb_step += 1;
         }
 
-        self.get_ideal_tx_power_index_and_dr(
+        Self::get_ideal_tx_power_index_and_dr(
             nb_step,
             tx_power_index,
             dr,
@@ -191,7 +190,7 @@ impl Handler for Algorithm {
             return Ok(resp);
         }
 
-        let (desired_tx_power_index, desired_dr) = self.get_ideal_tx_power_index_and_dr(
+        let (desired_tx_power_index, desired_dr) = Self::get_ideal_tx_power_index_and_dr(
             n_step,
             resp.tx_power_index,
             resp.dr,
diff --git a/chirpstack/src/storage/device_keys.rs b/chirpstack/src/storage/device_keys.rs
index 194a5cb9..3ed2369c 100644
--- a/chirpstack/src/storage/device_keys.rs
+++ b/chirpstack/src/storage/device_keys.rs
@@ -10,7 +10,7 @@ use super::error::Error;
 use super::get_db_conn;
 use super::schema::device_keys;
 
-#[derive(Queryable, Insertable, AsChangeset, PartialEq, Debug, Clone)]
+#[derive(Queryable, Insertable, AsChangeset, PartialEq, Eq, Debug, Clone)]
 #[diesel(table_name = device_keys)]
 pub struct DeviceKeys {
     pub dev_eui: EUI64,
diff --git a/chirpstack/src/storage/multicast.rs b/chirpstack/src/storage/multicast.rs
index bd09fca2..1a9c179d 100644
--- a/chirpstack/src/storage/multicast.rs
+++ b/chirpstack/src/storage/multicast.rs
@@ -15,7 +15,7 @@ use super::schema::{device, multicast_group, multicast_group_device, multicast_g
 use crate::downlink::classb;
 use crate::{config, gpstime::ToDateTime, gpstime::ToGpsTime};
 
-#[derive(Clone, Queryable, Insertable, Debug, PartialEq)]
+#[derive(Clone, Queryable, Insertable, Debug, PartialEq, Eq)]
 #[diesel(table_name = multicast_group)]
 pub struct MulticastGroup {
     pub id: Uuid,