Fixed up ordering of setting keys