[#9629] Fix strict warnings