Settings fixes: