Re #10390. Fix compile warnings.