Improve some things