Fix to OrderItem types