More ordering changes