Fix some warnings

Change-Id: Ib661af2ab2ad2e95890edb1edf979a82e67a9443