Settings fixes..