Add core deployment fixes to et-deploy-core()