fix some type warnings

Change-Id: Ifb153429f8129e4da35d7e3c3186e674e7330f8d