Setting fixes