Improve warnings.