Improve some warning messages