Fix some ERC stuff