Corrected the ERC warnings.