Fix some gcc warnings

Change-Id: I050ff01a3d18063a81ea050fc7901168406e989e