Changing order or things to try and make migration of ServerSettings
work