Improve a few settings