Fixes to shopping cart