Addressed warnings.