- fix some warnings

Change-Id: I412fc414afbac97c5d4e31b099b8cf96c9970cd6