Clean up some error messages/warnings.