Settings fixes