Some settings tweaks