Fixed 26412 and 26550 following ci build errors.