Fix property ordering