Fix some warnings

Change-Id: I2093f28ecb9b22b7cc8399d68b71b0d82595e715