Tidy up some compile warnings