fix some compiler warnings

Change-Id: I29b0f1c0ddaa5898f38efbddfea37d5dbf141a10
ChangeLog v1.4 -> v1.5