Several fixes to ecommerce glitches