Fix ordering of settings