Clean up build warnings

Change-Id: Ia8a892c67f8d2437a374f7d1b385c45bbd568e24
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>