Remove compiler warnings

Change-Id: I8548ddc02a32decfe8fc66d8dfb80e6466493b6c