Improve some consistency