Cleaned up ERC warnings.