Settings validation + tweaks