Minor fixes including #10635.