Setting control tweaks