Tidy up some warnings