Removed several warnings.