diff --git a/contracts/src/traits/timelock_controller/mod.rs b/contracts/src/traits/timelock_controller/mod.rs
index 6ca457d81..958c0ec17 100644
--- a/contracts/src/traits/timelock_controller/mod.rs
+++ b/contracts/src/traits/timelock_controller/mod.rs
@@ -54,7 +54,10 @@ impl Default for Transaction {
     fn default() -> Self {
         Self {
             callee: ZERO_ADDRESS.into(),
-            ..Default::default()
+            selector: Default::default(),
+            input: Default::default(),
+            transferred_value: Default::default(),
+            gas_limit: Default::default(),
         }
     }
 }
diff --git a/contracts/src/upgradeability/diamond/diamond.rs b/contracts/src/upgradeability/diamond/diamond.rs
index 2992d8a4a..ef772e40b 100644
--- a/contracts/src/upgradeability/diamond/diamond.rs
+++ b/contracts/src/upgradeability/diamond/diamond.rs
@@ -35,7 +35,6 @@ pub use ownable::Internal as _;
 
 use ink::{
     env::call::{
-        DelegateCall,
         ExecutionInput,
         Selector as InkSelector,
     },
diff --git a/contracts/src/upgradeability/proxy/mod.rs b/contracts/src/upgradeability/proxy/mod.rs
index 4012a9884..edeeb0be5 100644
--- a/contracts/src/upgradeability/proxy/mod.rs
+++ b/contracts/src/upgradeability/proxy/mod.rs
@@ -33,13 +33,11 @@ pub use crate::{
 pub use ownable::Internal as _;
 pub use proxy::Internal as _;
 
-use ink::env::call::DelegateCall;
 use openbrush::{
     modifiers,
     traits::{
         Hash,
         Storage,
-        StorageAsRef,
     },
 };
 
diff --git a/example_project_structure/impls/lending/data.rs b/example_project_structure/impls/lending/data.rs
index 4c666f51e..afd4e9636 100644
--- a/example_project_structure/impls/lending/data.rs
+++ b/example_project_structure/impls/lending/data.rs
@@ -52,8 +52,13 @@ pub struct Data {
 impl Default for Data {
     fn default() -> Self {
         Self {
+            assets_lended: Default::default(),
+            asset_shares: Default::default(),
+            shares_asset: Default::default(),
+            collateral_accepted: Default::default(),
+            asset_price: Default::default(),
+            shares_contract_code_hash: Hash::default(),
             loan_account: [0u8; 32].into(),
-            ..Default::default()
         }
     }
 }
diff --git a/example_project_structure/traits/loan.rs b/example_project_structure/traits/loan.rs
index 51ee13b63..a882fe3e2 100644
--- a/example_project_structure/traits/loan.rs
+++ b/example_project_structure/traits/loan.rs
@@ -34,8 +34,12 @@ impl Default for LoanInfo {
         Self {
             borrower: [0u8; 32].into(),
             collateral_token: [0u8; 32].into(),
+            collateral_amount: Balance::default(),
             borrow_token: [0u8; 32].into(),
-            ..Defalt::default()
+            borrow_amount: Balance::default(),
+            liquidation_price: Balance::default(),
+            timestamp: Timestamp::default(),
+            liquidated: false,
         }
     }
 }