Improve some errors