diff --git a/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm b/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm
index c50aa4a3eb..461eff1a39 100644
Binary files a/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm and b/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm differ
diff --git a/substrate/srml/support/src/lib.rs b/substrate/srml/support/src/lib.rs
index a8b1fa88a4..e9cd35afa5 100644
--- a/substrate/srml/support/src/lib.rs
+++ b/substrate/srml/support/src/lib.rs
@@ -24,7 +24,8 @@
 #[cfg(feature = "std")]
 extern crate serde;
 
-extern crate sr_std as rstd;
+#[doc(hidden)]
+pub extern crate sr_std as rstd;
 extern crate sr_io as runtime_io;
 #[doc(hidden)]
 pub extern crate sr_primitives as runtime_primitives;
diff --git a/substrate/srml/support/src/storage/generator.rs b/substrate/srml/support/src/storage/generator.rs
index 5b01a686c6..f3e2f0e8c0 100644
--- a/substrate/srml/support/src/storage/generator.rs
+++ b/substrate/srml/support/src/storage/generator.rs
@@ -379,7 +379,7 @@ macro_rules! __storage_items_internal {
 			}
 
 			/// Get the storage key used to fetch a value corresponding to a specific key.
-			fn key_for(x: &$kty) -> Vec<u8> {
+			fn key_for(x: &$kty) -> $crate::rstd::vec::Vec<u8> {
 				let mut key = $prefix.to_vec();
 				$crate::codec::Encode::encode_to(x, &mut key);
 				key
@@ -441,21 +441,21 @@ macro_rules! __storage_items_internal {
 
 			/// Get the key used to put the length field.
 			// TODO: concat macro should accept byte literals.
-			fn len_key() -> Vec<u8> {
+			fn len_key() -> $crate::rstd::vec::Vec<u8> {
 				let mut key = $prefix.to_vec();
 				key.extend(b"len");
 				key
 			}
 
 			/// Get the storage key used to fetch a value at a given index.
-			fn key_for(index: u32) -> Vec<u8> {
+			fn key_for(index: u32) -> $crate::rstd::vec::Vec<u8> {
 				let mut key = $prefix.to_vec();
 				$crate::codec::Encode::encode_to(&index, &mut key);
 				key
 			}
 
 			/// Read out all the items.
-			fn items<S: $crate::GenericStorage>(storage: &S) -> Vec<$ty> {
+			fn items<S: $crate::GenericStorage>(storage: &S) -> $crate::rstd::vec::Vec<$ty> {
 				(0..<$name as $crate::storage::generator::StorageList<$ty>>::len(storage))
 					.map(|i| <$name as $crate::storage::generator::StorageList<$ty>>::get(i, storage).expect("all items within length are set; qed"))
 					.collect()
@@ -1867,7 +1867,7 @@ macro_rules! __decl_storage_item {
 			}
 
 			/// Get the storage key used to fetch a value corresponding to a specific key.
-			fn key_for(x: &$kty) -> Vec<u8> {
+			fn key_for(x: &$kty) -> $crate::rstd::vec::Vec<u8> {
 				let mut key = <$name<$traitinstance> as $crate::storage::generator::StorageMap<$kty, $ty>>::prefix().to_vec();
 				$crate::codec::Encode::encode_to(x, &mut key);
 				key