Fixing some compiler warnings. Re #7726