More ERC changes