Misc bug fixes for shopping cart