Remove from cart bug fixes