Fix warnings after commit#17578.