Fix some warnings

Change-Id: Idccfcd385f0b8f82f1679773eb18462efd67a032
5 files changed