Fix some shopping cart's issues