More settings tweaks for #693