Fix upstream 74, 75.