Improve some other things