diff --git a/migrations/2_deploy_contract.js b/migrations/2_deploy_contract.js
index 6176e20..028017f 100644
--- a/migrations/2_deploy_contract.js
+++ b/migrations/2_deploy_contract.js
@@ -207,7 +207,8 @@ module.exports = function(deployer, network, accounts) {
           "PROXY_ADDRESS": proxyStorage.address,
           "POA_ADDRESS": poaNetworkConsensusAddress,
           "EMISSION_FUNDS_ADDRESS": emissionFunds.address,
-          "REWARD_BY_BLOCK_ADDRESS": rewardByBlock.address
+          "REWARD_BY_BLOCK_ADDRESS": rewardByBlock.address,
+          "MOC": masterOfCeremony
         };
 
         fs.writeFileSync('./contracts.json', JSON.stringify(contracts, null, 2));
diff --git a/scripts/migrate/migrateAll.js b/scripts/migrate/migrateAll.js
index c2de7a1..50c432b 100644
--- a/scripts/migrate/migrateAll.js
+++ b/scripts/migrate/migrateAll.js
@@ -241,9 +241,9 @@ async function main() {
 		console.log('');
 
 		console.log('VotingToManageEmissionFunds.init...');
-		const distributionThreshold = 259200; // three days, in seconds
-		const emissionReleaseThreshold = 604800; // seven days, in seconds
-		const emissionReleaseTime = Math.floor(new Date() / 1000) + emissionReleaseThreshold; // now plus emissionReleaseThreshold (unix timestamp)
+		const distributionThreshold = 604800; // seven days, in seconds
+		const emissionReleaseThreshold = 7776000; // three months, in seconds
+		const emissionReleaseTime = 1550509200; // Monday, 18-Feb-2019 17:00:00 UTC (unix timestamp)
 		init = votingToManageEmissionFundsInstance.methods.init(
 			emissionReleaseTime,
 			emissionReleaseThreshold,
@@ -282,9 +282,11 @@ async function main() {
 		emissionFundsAddress.should.be.equal(
 			EthereumUtil.toChecksumAddress(await rewardByBlockInstance.methods.emissionFunds().call())
 		);
-		'0x0000000000000000000000000000000000000000'.should.be.equal(
-			await rewardByBlockInstance.methods.bridgeContract().call()
-		);
+		(await rewardByBlockInstance.methods.bridgesAllowed().call()).should.be.deep.equal([
+			'0x0000000000000000000000000000000000000000',
+			'0x0000000000000000000000000000000000000000',
+			'0x0000000000000000000000000000000000000000'
+		]);
 		process.env.PROXY_STORAGE_NEW_ADDRESS.should.be.equal(
 			await rewardByBlockInstance.methods.proxyStorage().call()
 		);
diff --git a/scripts/migrate/migrateVotings.js b/scripts/migrate/migrateVotings.js
index 8b85c68..36f6f0c 100644
--- a/scripts/migrate/migrateVotings.js
+++ b/scripts/migrate/migrateVotings.js
@@ -263,9 +263,15 @@ async function votingToChangeMigrateAndCheck(sender, key, chainId, contractName)
 
 			console.log('  Set miningByVoting...');
 			let miningByVoting = {};
-			events = await keysManagerInstance.getPastEvents('ValidatorInitialized', {fromBlock: 0, toBlock: 'latest'});
-			for (i = 0; i < events.length; i++) {
-				miningByVoting[events[i].returnValues.votingKey] = events[i].returnValues.miningKey;
+			try {
+				events = await keysManagerInstance.getPastEvents('ValidatorInitialized', {fromBlock: 0, toBlock: 'latest'});
+				for (i = 0; i < events.length; i++) {
+					miningByVoting[events[i].returnValues.votingKey] = events[i].returnValues.miningKey;
+				}
+			} catch (events_err) {
+				if (events_err.message.indexOf('Returned values aren\'t valid') < 0) {
+					throw events_err;
+				}
 			}
 			events = await keysManagerInstance.getPastEvents('VotingKeyChanged', {fromBlock: 0, toBlock: 'latest'});
 			for (i = 0; i < events.length; i++) {
diff --git a/scripts/migrate/package-lock.json b/scripts/migrate/package-lock.json
index 56ebbea..333034e 100644
--- a/scripts/migrate/package-lock.json
+++ b/scripts/migrate/package-lock.json
@@ -2546,14 +2546,6 @@
         "mime-types": "~2.1.18"
       }
     },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
@@ -2902,8 +2894,27 @@
       "integrity": "sha512-wAnENuZx75T5ZSrT2De2LOaUuPf2yRjq1VfcbD7+Zd79F3DZZLBJcPyCNVQ1U0fAXt0wfgCKl7sVw5pffqR9Bw==",
       "requires": {
         "underscore": "1.8.3",
-        "web3-core-helpers": "1.0.0-beta.36",
-        "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
+        "web3-core-helpers": "1.0.0-beta.36"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "websocket": {
+          "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
+          "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
+          "requires": {
+            "debug": "^2.2.0",
+            "nan": "^2.3.3",
+            "typedarray-to-buffer": "^3.1.2",
+            "yaeti": "^0.0.6"
+          }
+        }
       }
     },
     "web3-shh": {
@@ -2938,26 +2949,6 @@
         }
       }
     },
-    "websocket": {
-      "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
-      "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible",
-      "requires": {
-        "debug": "^2.2.0",
-        "nan": "^2.3.3",
-        "typedarray-to-buffer": "^3.1.2",
-        "yaeti": "^0.0.6"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
     "which-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
@@ -3048,11 +3039,6 @@
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
       "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
     },
-    "yaeti": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
-      "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc="
-    },
     "yargs": {
       "version": "4.8.1",
       "resolved": "http://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",