diff --git a/contracts/compliance/src/lib.rs b/contracts/compliance/src/lib.rs
index 5537187..5b7c328 100644
--- a/contracts/compliance/src/lib.rs
+++ b/contracts/compliance/src/lib.rs
@@ -905,6 +905,7 @@ impl ComplianceContract {
     }
 
     /// Compute the current [`AddressState`] for a single address without auth.
+    #[allow(dead_code)]
     fn address_state(env: &Env, addr: &Address) -> AddressState {
         let blocked: bool = env
             .storage()
diff --git a/contracts/invoice/tests/invoice_test.rs b/contracts/invoice/tests/invoice_test.rs
index 03f25e2..22dc2a5 100644
--- a/contracts/invoice/tests/invoice_test.rs
+++ b/contracts/invoice/tests/invoice_test.rs
@@ -700,9 +700,10 @@ fn test_cancelled_invoice_cannot_be_marked_paid() {
 
 #[test]
 fn test_cancel_invoice_unauthorized_rejected() {
-    let (env, _admin, client) = setup();
+    let (env, admin, client) = setup();
     let merchant = Address::generate(&env);
     let unauthorized = Address::generate(&env);
+    let payer = Address::generate(&env);
     let id = client.create_invoice(
         &merchant,
         &10_000_000,
diff --git a/contracts/treasury/tests/duplicate_approval_test.rs b/contracts/treasury/tests/duplicate_approval_test.rs
index 93bf7c2..064a9e6 100644
--- a/contracts/treasury/tests/duplicate_approval_test.rs
+++ b/contracts/treasury/tests/duplicate_approval_test.rs
@@ -1,7 +1,7 @@
 use soroban_sdk::{testutils::Address as _, Address, Env};
 use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};
 
-fn setup(env: &Env) -> (TreasuryContractClient, Address, u64) {
+fn setup(env: &Env) -> (TreasuryContractClient<'_>, Address, u64) {
     let admin = Address::generate(env);
     let merchant = Address::generate(env);
     let contract_id = env.register_contract(None, TreasuryContract);
diff --git a/contracts/treasury/tests/partial_settlement_test.rs b/contracts/treasury/tests/partial_settlement_test.rs
index 23e5ae4..c284c06 100644
--- a/contracts/treasury/tests/partial_settlement_test.rs
+++ b/contracts/treasury/tests/partial_settlement_test.rs
@@ -1,7 +1,7 @@
 use soroban_sdk::{testutils::Address as _, Address, Env};
 use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};
 
-fn setup(env: &Env, total: i128) -> (TreasuryContractClient, Address, Address, u64) {
+fn setup(env: &Env, total: i128) -> (TreasuryContractClient<'_>, Address, Address, u64) {
     let admin = Address::generate(env);
     let merchant = Address::generate(env);
     let contract_id = env.register_contract(None, TreasuryContract);
diff --git a/contracts/treasury/tests/settlement_pagination_test.rs b/contracts/treasury/tests/settlement_pagination_test.rs
index 8d75985..b070241 100644
--- a/contracts/treasury/tests/settlement_pagination_test.rs
+++ b/contracts/treasury/tests/settlement_pagination_test.rs
@@ -6,7 +6,7 @@ use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};
 // is a read-only scan, so this is a generous ceiling, not a tight one.
 const PAGE_INSTRUCTION_BUDGET: u64 = 100_000_000;
 
-fn setup_with_settlements(env: &Env, n: u64) -> (TreasuryContractClient, Address) {
+fn setup_with_settlements(env: &Env, n: u64) -> (TreasuryContractClient<'_>, Address) {
     let admin = Address::generate(env);
     let contract_id = env.register_contract(None, TreasuryContract);
     let client = TreasuryContractClient::new(env, &contract_id);
diff --git a/contracts/treasury/tests/task1_tests.rs b/contracts/treasury/tests/task1_tests.rs
index ec97eed..f41839d 100644
--- a/contracts/treasury/tests/task1_tests.rs
+++ b/contracts/treasury/tests/task1_tests.rs
@@ -8,9 +8,9 @@ use soroban_sdk::{
     testutils::{Address as _, Events},
     Address, Env, FromVal, Symbol,
 };
-use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};
+use treasury::{TreasuryContract, TreasuryContractClient};
 
-fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient, Address, Address) {
+fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient<'_>, Address, Address) {
     env.mock_all_auths();
     let admin = Address::generate(env);
     let id = env.register_contract(None, TreasuryContract);
diff --git a/contracts/treasury/tests/threshold_update_test.rs b/contracts/treasury/tests/threshold_update_test.rs
index 1065eba..ed2434a 100644
--- a/contracts/treasury/tests/threshold_update_test.rs
+++ b/contracts/treasury/tests/threshold_update_test.rs
@@ -1,7 +1,7 @@
 use soroban_sdk::{testutils::Address as _, Address, Env};
 use treasury::{TreasuryContract, TreasuryContractClient};
 
-fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient, Address) {
+fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient<'_>, Address) {
     let admin = Address::generate(env);
     let contract_id = env.register_contract(None, TreasuryContract);
     let client = TreasuryContractClient::new(env, &contract_id);
diff --git a/contracts/treasury/tests/treasury_test.rs b/contracts/treasury/tests/treasury_test.rs
index e91e282..1ede7d1 100644
--- a/contracts/treasury/tests/treasury_test.rs
+++ b/contracts/treasury/tests/treasury_test.rs
@@ -1,7 +1,7 @@
 use soroban_sdk::{testutils::Address as _, Address, Env};
 use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};
 
-fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient, Address, Address) {
+fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient<'_>, Address, Address) {
     env.mock_all_auths();
     let admin = Address::generate(env);
     let id = env.register_contract(None, TreasuryContract);
diff --git a/contracts/treasury/tests/treasury_threshold_rejection_test.rs b/contracts/treasury/tests/treasury_threshold_rejection_test.rs
index fb8ca77..cd6689a 100644
--- a/contracts/treasury/tests/treasury_threshold_rejection_test.rs
+++ b/contracts/treasury/tests/treasury_threshold_rejection_test.rs
@@ -1,7 +1,7 @@
 use soroban_sdk::{testutils::Address as _, Address, Env};
 use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};
 
-fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient, Address, Address, Address) {
+fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient<'_>, Address, Address, Address) {
     let admin = Address::generate(env);
     let merchant = Address::generate(env);
     let contract_id = env.register_contract(None, TreasuryContract);
diff --git a/contracts/treasury/tests/unauthorized_signer_test.rs b/contracts/treasury/tests/unauthorized_signer_test.rs
index 48a26b0..ba4d0df 100644
--- a/contracts/treasury/tests/unauthorized_signer_test.rs
+++ b/contracts/treasury/tests/unauthorized_signer_test.rs
@@ -1,7 +1,7 @@
 use soroban_sdk::{testutils::Address as _, Address, Env};
 use treasury::{TreasuryContract, TreasuryContractClient};
 
-fn setup_treasury(env: &Env, threshold: u32) -> (TreasuryContractClient, Address, Address) {
+fn setup_treasury(env: &Env, threshold: u32) -> (TreasuryContractClient<'_>, Address, Address) {
     env.mock_all_auths();
     let admin = Address::generate(env);
     let contract_id = env.register_contract(None, TreasuryContract);
diff --git a/tests/tests/invoice_treasury_integration_test.rs b/tests/tests/invoice_treasury_integration_test.rs
index 8b1c88a..599eabd 100644
--- a/tests/tests/invoice_treasury_integration_test.rs
+++ b/tests/tests/invoice_treasury_integration_test.rs
@@ -1,7 +1,7 @@
 use invoice::{
-    InvoiceContract, InvoiceContractClient, InvoiceError, InvoiceStatus, MaybeAddress, MaybeBytes,
+    InvoiceContract, InvoiceContractClient, InvoiceStatus, MaybeAddress, MaybeBytes,
 };
-use soroban_sdk::{contract, contractimpl, testutils::Address as _, Address, Env};
+use soroban_sdk::{testutils::Address as _, Address, Env};
 use treasury::{TreasuryContract, TreasuryContractClient};
 
 mod test_token {
@@ -79,7 +79,7 @@ fn setup() -> (
 
 #[test]
 fn invoice_created_paid_released() {
-    let (env, admin, merchant, payer, invoice, _treasury_id, _treasury, _token_id) = setup();
+    let (_env, admin, merchant, payer, invoice, _treasury_id, _treasury, _token_id) = setup();
 
     let id = invoice.create_invoice(
         &merchant,