Improve some of the default values