diff --git a/Cargo.lock b/Cargo.lock
index 52aa4fc23fde..7c23afe75ebe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -819,7 +819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "fork-tree"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3557,7 +3557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "sr-api-macros"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3569,7 +3569,7 @@ dependencies = [
 [[package]]
 name = "sr-io"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "environmental 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3586,7 +3586,7 @@ dependencies = [
 [[package]]
 name = "sr-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3604,7 +3604,7 @@ dependencies = [
 [[package]]
 name = "sr-staking-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -3614,7 +3614,7 @@ dependencies = [
 [[package]]
 name = "sr-std"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3622,7 +3622,7 @@ dependencies = [
 [[package]]
 name = "sr-version"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3634,7 +3634,7 @@ dependencies = [
 [[package]]
 name = "srml-authorship"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -3649,7 +3649,7 @@ dependencies = [
 [[package]]
 name = "srml-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "hex-literal 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3669,7 +3669,7 @@ dependencies = [
 [[package]]
 name = "srml-balances"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3684,7 +3684,7 @@ dependencies = [
 [[package]]
 name = "srml-collective"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3700,7 +3700,7 @@ dependencies = [
 [[package]]
 name = "srml-democracy"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3715,7 +3715,7 @@ dependencies = [
 [[package]]
 name = "srml-elections"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3731,7 +3731,7 @@ dependencies = [
 [[package]]
 name = "srml-executive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3745,7 +3745,7 @@ dependencies = [
 [[package]]
 name = "srml-finality-tracker"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3759,7 +3759,7 @@ dependencies = [
 [[package]]
 name = "srml-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3778,7 +3778,7 @@ dependencies = [
 [[package]]
 name = "srml-im-online"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3796,7 +3796,7 @@ dependencies = [
 [[package]]
 name = "srml-indices"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3813,7 +3813,7 @@ dependencies = [
 [[package]]
 name = "srml-membership"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3827,7 +3827,7 @@ dependencies = [
 [[package]]
 name = "srml-metadata"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3838,7 +3838,7 @@ dependencies = [
 [[package]]
 name = "srml-offences"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3853,7 +3853,7 @@ dependencies = [
 [[package]]
 name = "srml-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3871,7 +3871,7 @@ dependencies = [
 [[package]]
 name = "srml-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3885,12 +3885,13 @@ dependencies = [
  "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "substrate-phragmen 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
 ]
 
 [[package]]
 name = "srml-sudo"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3905,7 +3906,7 @@ dependencies = [
 [[package]]
 name = "srml-support"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3924,7 +3925,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3936,7 +3937,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural-tools"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3948,7 +3949,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural-tools-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3958,7 +3959,7 @@ dependencies = [
 [[package]]
 name = "srml-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3974,7 +3975,7 @@ dependencies = [
 [[package]]
 name = "srml-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3988,7 +3989,7 @@ dependencies = [
 [[package]]
 name = "srml-treasury"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4074,7 +4075,7 @@ dependencies = [
 [[package]]
 name = "substrate-application-crypto"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4097,7 +4098,7 @@ dependencies = [
 [[package]]
 name = "substrate-cli"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4132,7 +4133,7 @@ dependencies = [
 [[package]]
 name = "substrate-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4160,7 +4161,7 @@ dependencies = [
 [[package]]
 name = "substrate-client-db"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
@@ -4183,7 +4184,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4218,7 +4219,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-babe-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "schnorrkel 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4232,7 +4233,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-common"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4251,7 +4252,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-slots"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4269,7 +4270,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-uncles"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4283,7 +4284,7 @@ dependencies = [
 [[package]]
 name = "substrate-executor"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4307,7 +4308,7 @@ dependencies = [
 [[package]]
 name = "substrate-finality-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "finality-grandpa 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4335,7 +4336,7 @@ dependencies = [
 [[package]]
 name = "substrate-finality-grandpa-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4348,7 +4349,7 @@ dependencies = [
 [[package]]
 name = "substrate-inherents"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4359,7 +4360,7 @@ dependencies = [
 [[package]]
 name = "substrate-keyring"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4371,7 +4372,7 @@ dependencies = [
 [[package]]
 name = "substrate-keystore"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4386,7 +4387,7 @@ dependencies = [
 [[package]]
 name = "substrate-network"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4427,7 +4428,7 @@ dependencies = [
 [[package]]
 name = "substrate-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4452,7 +4453,7 @@ dependencies = [
 [[package]]
 name = "substrate-offchain-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4461,7 +4462,7 @@ dependencies = [
 [[package]]
 name = "substrate-panic-handler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4470,7 +4471,7 @@ dependencies = [
 [[package]]
 name = "substrate-peerset"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4480,10 +4481,19 @@ dependencies = [
  "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "substrate-phragmen"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
+dependencies = [
+ "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+]
+
 [[package]]
 name = "substrate-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4516,36 +4526,51 @@ dependencies = [
 [[package]]
 name = "substrate-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
- "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core-client 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-derive 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-pubsub 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "substrate-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "substrate-rpc-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
 ]
 
+[[package]]
+name = "substrate-rpc-api"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
+dependencies = [
+ "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core-client 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-derive 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-pubsub 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "substrate-transaction-graph 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+]
+
 [[package]]
 name = "substrate-rpc-servers"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "jsonrpc-core 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4559,7 +4584,7 @@ dependencies = [
 [[package]]
 name = "substrate-serializer"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4568,7 +4593,7 @@ dependencies = [
 [[package]]
 name = "substrate-service"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4607,7 +4632,7 @@ dependencies = [
 [[package]]
 name = "substrate-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4618,7 +4643,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-db"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4629,7 +4654,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-machine"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4646,7 +4671,7 @@ dependencies = [
 [[package]]
 name = "substrate-telemetry"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4668,7 +4693,7 @@ dependencies = [
 [[package]]
 name = "substrate-transaction-graph"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4682,7 +4707,7 @@ dependencies = [
 [[package]]
 name = "substrate-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4697,7 +4722,7 @@ dependencies = [
 [[package]]
 name = "substrate-trie"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#46b63afe5f593f1035bcc0d84e4619826c12881a"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#3ba0f2a2dbd37c31851a0ff1c1c0c47aa940de90"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5920,8 +5945,10 @@ dependencies = [
 "checksum substrate-offchain-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-peerset 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
+"checksum substrate-phragmen 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
+"checksum substrate-rpc-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-rpc-servers 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
diff --git a/executor/src/lib.rs b/executor/src/lib.rs
index 45bbda866ee6..010048525af8 100644
--- a/executor/src/lib.rs
+++ b/executor/src/lib.rs
@@ -22,6 +22,5 @@ use substrate_executor::native_executor_instance;
 native_executor_instance!(
     pub Executor,
     polkadot_runtime::api::dispatch,
-    polkadot_runtime::native_version,
-    polkadot_runtime::WASM_BINARY
+    polkadot_runtime::native_version
 );
diff --git a/runtime/src/claims.rs b/runtime/src/claims.rs
index fcbfbfdba765..a0ca79b0e578 100644
--- a/runtime/src/claims.rs
+++ b/runtime/src/claims.rs
@@ -115,7 +115,6 @@ decl_storage! {
 	}
 	add_extra_genesis {
 		config(claims): Vec<(EthereumAddress, BalanceOf<T>)>;
-
 	}
 }
 
@@ -125,7 +124,7 @@ decl_module! {
 		const Prefix: &[u8] = T::Prefix::get();
 
 		/// Deposit one of this module's events by using the default implementation.
-		fn deposit_event<T>() = default;
+		fn deposit_event() = default;
 
 		/// Make a claim.
 		#[weight = SimpleDispatchInfo::FixedNormal(1_000_000)]
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index dd99246f69e0..b83da9c178ae 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -54,7 +54,7 @@ use sr_staking_primitives::SessionIndex;
 use srml_support::{
 	parameter_types, construct_runtime, traits::{SplitTwoWays, Currency}
 };
-use im_online::AuthorityId as ImOnlineId;
+use im_online::sr25519::{AuthorityId as ImOnlineId};
 
 #[cfg(feature = "std")]
 pub use staking::StakerStatus;
@@ -414,6 +414,7 @@ impl offences::Trait for Runtime {
 }
 
 impl im_online::Trait for Runtime {
+	type AuthorityId = ImOnlineId;
 	type Call = Call;
 	type Event = Event;
 	type UncheckedExtrinsic = UncheckedExtrinsic;
@@ -506,7 +507,7 @@ construct_runtime!(
 		Session: session::{Module, Call, Storage, Event, Config<T>},
 		FinalityTracker: finality_tracker::{Module, Call, Inherent},
 		Grandpa: grandpa::{Module, Call, Storage, Config, Event},
-		ImOnline: im_online::{Module, Call, Storage, Event, ValidateUnsigned, Config},
+		ImOnline: im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
 
 		// Governance stuff; uncallable initially.
 		Democracy: democracy::{Module, Call, Storage, Config, Event<T>},
diff --git a/runtime/src/parachains.rs b/runtime/src/parachains.rs
index b507e6d1b50d..32dc974d1c4d 100644
--- a/runtime/src/parachains.rs
+++ b/runtime/src/parachains.rs
@@ -31,7 +31,7 @@ use primitives::{Hash, Balance, parachain::{
 }};
 use {system, session};
 use srml_support::{
-	StorageValue, StorageMap, storage::AppendableStorageMap, Parameter, Dispatchable, dispatch::Result,
+	StorageValue, StorageMap, Parameter, Dispatchable, dispatch::Result,
 	traits::{Currency, Get, WithdrawReason, ExistenceRequirement}
 };
 
@@ -256,26 +256,21 @@ decl_storage! {
 }
 
 #[cfg(feature = "std")]
-fn build<T: Trait>(
-	storage: &mut (StorageOverlay, ChildrenStorageOverlay),
-	config: &GenesisConfig<T>
-) {
+fn build<T: Trait>(config: &GenesisConfig<T>) {
 	let mut p = config.parachains.clone();
 	p.sort_unstable_by_key(|&(ref id, _, _)| *id);
 	p.dedup_by_key(|&mut (ref id, _, _)| *id);
 
 	let only_ids: Vec<ParaId> = p.iter().map(|&(ref id, _, _)| id).cloned().collect();
 
-	sr_io::with_storage(storage, || {
-		Parachains::put(&only_ids);
+	Parachains::put(&only_ids);
 
-		for (id, code, genesis) in p {
-			// no ingress -- a chain cannot be routed to until it is live.
-			Code::insert(&id, &code);
-			Heads::insert(&id, &genesis);
-			<Watermarks<T>>::insert(&id, &sr_primitives::traits::Zero::zero());
-		}
-	});
+	for (id, code, genesis) in p {
+		// no ingress -- a chain cannot be routed to until it is live.
+		Code::insert(&id, &code);
+		Heads::insert(&id, &genesis);
+		<Watermarks<T>>::insert(&id, &sr_primitives::traits::Zero::zero());
+	}
 }
 
 decl_module! {
diff --git a/runtime/src/slots.rs b/runtime/src/slots.rs
index 2f7fb89e1515..c7a4bbe98502 100644
--- a/runtime/src/slots.rs
+++ b/runtime/src/slots.rs
@@ -203,7 +203,7 @@ decl_event!(
 
 decl_module! {
 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
-		fn deposit_event<T>() = default;
+		fn deposit_event() = default;
 
 		fn on_initialize(n: T::BlockNumber) {
 			let lease_period = T::LeasePeriod::get();
diff --git a/service/src/chain_spec.rs b/service/src/chain_spec.rs
index c48c44158f3e..a0965d619282 100644
--- a/service/src/chain_spec.rs
+++ b/service/src/chain_spec.rs
@@ -29,7 +29,7 @@ use telemetry::TelemetryEndpoints;
 use hex_literal::hex;
 use babe_primitives::AuthorityId as BabeId;
 use grandpa::AuthorityId as GrandpaId;
-use im_online::AuthorityId as ImOnlineId;
+use im_online::sr25519::{AuthorityId as ImOnlineId};
 use srml_staking::Forcing;
 
 const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";