Re #10577 Fixing more compiler warnings