Settings improvements.