Fix dashboard warnings

This fixes a few dashboard warnings found by clang.

Change-Id: I08173fba0c0352859eecf96e9357a81f8bcf78db
Merge topic 'fix-warnings' into next

3878e2e Fix dashboard warnings