Improvements in setting handling