Fixes for substrate#1404 (#76)

* Fixes for substrate#1404

* Updates for latest Substrate

* Update lock file

* Update runtime.
5 jobs for master in 14 minutes and 57 seconds (queued for 1 second)