fix various warnings

Change-Id: Iecf54a3a0368c99705969679fe18ceda59ce4290
3 files changed