Fixed shopping cart issues