Various tweaks to settings