More fixes on return orders