Correcting types to remove warnings.