Fix warnings

This fixes a few warnings found by MSVC.

Change-Id: Ie08e2457a1ac6419c848b589a9a6199c35f173c8
Merge topic 'multi-block-color-support' into next

c0169ad Fix warnings
Fix shadow warnings

This fixes a couple shadow warnings found by GCC.

Change-Id: I9e50cec746e1e36f12cf51cab47bc1feec645a26
Merge topic 'multi-block-color-support' into next

74b85a2 Fix shadow warnings