fix some warnings

Change-Id: I1f3fa582d8e3ddb3c981784dddb13e740102f4f3