Fixes for compilation warnings

Change-Id: I06336b6024ab737814e149f45faf2fa135dab807
Signed-off-by: gburns <gburns@qce.qualcomm.com>