Improve some settings