diff --git a/currencies/src/mock.rs b/currencies/src/mock.rs
index a78d598d6bbff579450952567de9174372a108c9..feb252ae014baef80ae27fd16bd9fbe918a6d47b 100644
--- a/currencies/src/mock.rs
+++ b/currencies/src/mock.rs
@@ -58,6 +58,7 @@ impl pallet_balances::Trait for Runtime {
 	type Balance = Balance;
 	type OnFreeBalanceZero = ();
 	type OnNewAccount = ();
+	type OnReapAccount = ();
 	type TransferPayment = ();
 	type DustRemoval = ();
 	type Event = ();
diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs
index e0ccea3ca61b9c7c4031a5fe6ec9154b222f3b36..8979c36d1ded4c5b8b0121bd7ed17b4156c346a4 100644
--- a/oracle/src/lib.rs
+++ b/oracle/src/lib.rs
@@ -33,7 +33,7 @@ pub trait Trait: frame_system::Trait {
 
 decl_storage! {
 	trait Store for Module<T: Trait> as Oracle {
-		pub RawValues get(raw_values): double_map T::OracleKey, blake2_256(T::AccountId) => Option<TimestampedValueOf<T>>;
+		pub RawValues get(raw_values): double_map T::OracleKey, T::AccountId => Option<TimestampedValueOf<T>>;
 		pub HasUpdate get(has_update): map T::OracleKey => bool;
 		pub Values get(values): map T::OracleKey => Option<TimestampedValueOf<T>>;
 	}
diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs
index 19a14768f95ab06820bc280f72e9963619bbb60d..e2a97193eaf1ed813a1c4a3688336f409fc6ca0f 100644
--- a/tokens/src/lib.rs
+++ b/tokens/src/lib.rs
@@ -58,7 +58,7 @@ decl_storage! {
 		}): map T::CurrencyId => T::Balance;
 
 		/// The balance of a token type under an account.
-		pub Balance get(fn balance): double_map T::CurrencyId, blake2_256(T::AccountId) => T::Balance;
+		pub Balance get(fn balance): double_map T::CurrencyId, T::AccountId => T::Balance;
 	}
 	add_extra_genesis {
 		config(endowed_accounts): Vec<(T::AccountId, T::CurrencyId, T::Balance)>;