More settings_wrapper tweaks.