Changes to settings loading