Improve default settings

This is changes that we ship in our packages.