diff --git a/.solcover.js b/.solcover.js
index f58d31ec6b..b1c7ef9b71 100644
--- a/.solcover.js
+++ b/.solcover.js
@@ -10,6 +10,7 @@ module.exports = {
 		'EscrowChecker.sol',
 		'ExchangeRatesWithoutInvPricing.sol',
 		'IssuerWithoutLiquidations.sol',
+		'EmptyEtherWrapper.sol',
 	],
 	providerOptions: {
 		default_balance_ether: 10000000000000, // extra zero just in case (coverage consumes more gas)
diff --git a/contracts/EmptyEtherWrapper.sol b/contracts/EmptyEtherWrapper.sol
new file mode 100644
index 0000000000..4a6d59447f
--- /dev/null
+++ b/contracts/EmptyEtherWrapper.sol
@@ -0,0 +1,15 @@
+pragma solidity ^0.5.16;
+
+// Stub functions required by the DebtCache and FeePool contracts.
+// https://docs.synthetix.io/contracts/source/contracts/etherwrapper
+contract EmptyEtherWrapper {
+    constructor() public {}
+
+    /* ========== VIEWS ========== */
+
+    function totalIssuedSynths() public view returns (uint) {
+        return 0;
+    }
+
+    function distributeFees() external {}
+}
diff --git a/hardhat/tasks/task-ops.js b/hardhat/tasks/task-ops.js
index f36a5ad321..327ce5555f 100644
--- a/hardhat/tasks/task-ops.js
+++ b/hardhat/tasks/task-ops.js
@@ -31,7 +31,7 @@ task('ops', 'Run Optimism chain')
 		taskArguments.maxMemory = true;
 
 		const opsPath = taskArguments.optimismPath.replace('~', homedir);
-		const opsBranch = 'regenesis/0.4.0';
+		const opsBranch = taskArguments.optimismBranch;
 		const opsCommit = taskArguments.optimismCommit;
 		const opsDetached = taskArguments.detached ? '-d' : '';
 
diff --git a/publish/deployed/local-ovm/synths.json b/publish/deployed/local-ovm/synths.json
index da5944c30c..1a7661364d 100644
--- a/publish/deployed/local-ovm/synths.json
+++ b/publish/deployed/local-ovm/synths.json
@@ -1,12 +1,10 @@
 [
 	{
 		"name": "sUSD",
-		"asset": "USD",
-		"subclass": "MultiCollateralSynth"
+		"asset": "USD"
 	},
 	{
 		"name": "sETH",
-		"asset": "ETH",
-		"subclass": "MultiCollateralSynth"
+		"asset": "ETH"
 	}
 ]
diff --git a/publish/src/commands/deploy/deploy-loans.js b/publish/src/commands/deploy/deploy-loans.js
index 8625b116b0..5c1f2e11bb 100644
--- a/publish/src/commands/deploy/deploy-loans.js
+++ b/publish/src/commands/deploy/deploy-loans.js
@@ -46,15 +46,18 @@ module.exports = async ({ account, addressOf, deployer, getDeployParameter, netw
 
 	await deployer.deployContract({
 		name: 'EtherWrapper',
+		source: useOvm ? 'EmptyEtherWrapper' : 'EtherWrapper',
 		deps: ['AddressResolver'],
-		args: [account, addressOf(ReadProxyAddressResolver), WETH_ADDRESS],
+		args: useOvm ? [] : [account, addressOf(ReadProxyAddressResolver), WETH_ADDRESS],
 	});
 
-	await deployer.deployContract({
-		name: 'NativeEtherWrapper',
-		deps: ['AddressResolver'],
-		args: [account, addressOf(ReadProxyAddressResolver)],
-	});
+	if (!useOvm) {
+		await deployer.deployContract({
+			name: 'NativeEtherWrapper',
+			deps: ['AddressResolver'],
+			args: [account, addressOf(ReadProxyAddressResolver)],
+		});
+	}
 
 	// ----------------
 	// Multi Collateral System