Minor tweak & fixing settings