Fix compiler warnings. Re #7623