More fixes related to Order/InternationalOrder