Fix type mixing warnings.