Cart, product fixes