Clean some compile warnings