Improving settings checks