Re #9199. Fixing compiler warnings