All ERC Errors fixed