Tidy up warnings.