tidy up some warnings