New Order bugfixes