Fix some warnings the CDash@Home builds missed.

Change-Id: I439578854f02cf47a5a57957289c6dc5271fe521
Merge topic 'more-warning-fixes' into master

05226544 Fix some warnings the CDash@Home builds missed.