Some fixes to how the order history works