Tidy up some compiler warnings