Tidy up some warnings.