Some ERC fixups.