Minor fixes including #10630.